diff --git a/etc/vim/vimrc.local.azerty b/etc/vim/vimrc.local.azerty new file mode 100644 index 0000000..c5bb3c9 --- /dev/null +++ b/etc/vim/vimrc.local.azerty @@ -0,0 +1,8 @@ +let additionals = [ "core", "miaou", "rookie", "azerty" ] +for additional in additionals + let s:vimrc_path = "/etc/vim/vimrc." . additional + if filereadable(s:vimrc_path) + execute "source " . expand(s:vimrc_path) + endif +endfor + diff --git a/lib/init.bash b/lib/init.bash index b32fc48..06be5d3 100755 --- a/lib/init.bash +++ b/lib/init.bash @@ -4,7 +4,7 @@ readonly AZERTY_ZONES=( 'Europe/Paris' - 'Indian/Reunion2' + 'Indian/Reunion' 'Indian/Mayotte' 'America/Cayenne' 'America/Guadeloupe' @@ -30,21 +30,24 @@ function no_more_skeleton { function link_etc { local filename="$1" subfolder="${2:-}" + local link_name="$filename" + [[ -v LINK_NAME ]] && link_name="$LINK_NAME" + local source="$MIAOU_BASH_DIR/etc" local destination="/etc" [[ -n "$subfolder" ]] && source+="/${subfolder}" && destination+="/${subfolder}" - if [[ -L "$destination/$filename" ]]; then - if [[ "$(readlink "$destination/$filename")" != "$source/$filename" ]]; then - ln -sf "$source/$filename" "$destination" - echo "link $source/$filename updated" + if [[ -L "$destination/$link_name" ]]; then + if [[ "$(readlink "$destination/$link_name")" != "$source/$filename" ]]; then + ln -sf "$source/$filename" "$destination/$link_name" + echo "link $source/$link_name updated" fi else - if [[ -f "$destination/$filename" ]]; then - mv "$destination/$filename" "$destination/$filename.$BACKUP" - echo "$destination/$filename.$BACKUP saved!" + if [[ -f "$destination/i$link_name" ]]; then + mv "$destination/$link_name" "$destination/$link_name.$BACKUP" + echo "$destination/$link_name.$BACKUP saved!" fi - ln -s "$source/$filename" "$destination" - echo "link $source/$filename created" + ln -s "$source/$filename" "$destination/$link_name" + echo "link $source/$link_name created" fi } @@ -52,9 +55,15 @@ function link_config_files { link_etc bash.bashrc link_etc inputrc link_etc vimrc.core vim - link_etc vimrc.local vim link_etc vimrc.miaou vim link_etc vimrc.rookie vim + + if in_azerty_zone; then + link_etc vimrc.azerty vim + LINK_NAME=vimrc.local link_etc vimrc.local.azerty vim + else + link_etc vimrc.local vim + fi } function in_azerty_zone { @@ -67,17 +76,6 @@ function in_azerty_zone { return 1 } -function link_azerty { - if in_azerty_zone; then - echo "AZERTY zone" - else - echo "NO AZERTY" - fi - echo COUCOU - # link_etc vimrc.azerty vim - # . "$MIAOU_BASH_DIR"/tools/smart_write 'let additionals = .*' 'let additionals = [ "core", "miaou", "rookie", "azerty" ]' /etc/vim/vimrc.local -} - # MAIN [ "$UID" -ne 0 ] && echo 'root privilege required' && exit 1 @@ -85,4 +83,3 @@ source "$MIAOU_BASH_DIR/lib/functions.bash" required_packages no_more_skeleton link_config_files -link_azerty