fix azerty

README.md

@@ -72,3 +72,9 @@ are greatly appreciated: [contact@artcode.re](mailto:contact@artcode.re)
   * [x] semver-git_tag
   * [x] fqdn
   * [ ] ...
+
+## Contributors
+
+* Philippe Vincent (_Artcode_)
+* Jean Noël Rouchon (_Mithril_)
+* Bruno Javotte (_Libranou_)

lib/doctor.bash

@@ -51,10 +51,10 @@ function lang_support {
 
 function doctor_miaou {
   echo '-- miaou --'
+  print_value 'VERSION' "$(miaou-bash --version)"
   print_value MIAOU_BASH_DIR "$MIAOU_BASH_DIR"
   print_value MIAOU_BASH_MODE "$MIAOU_BASH_MODE"
   print_value MIAOU_BASH_MODE_OWNER "$MIAOU_BASH_MODE_OWNER"
-  print_value 'VERSION' "$(miaou-bash --version)"
   print_value "AZERTY mode" "$(azerty_mode)"
   print_value "LANG support" "$(lang_support)"
 }
@@ -77,7 +77,7 @@ function doctor_test_suite {
 
 source "$MIAOU_BASH_DIR"/lib/functions.bash
 
-echo '== MIAOU DOCTOR =='
+echo '== MIAOU BASH DOCTOR =='
 fetch_mode
 doctor_distribution
 doctor_environment

lib/initiate.bash

@@ -87,6 +87,15 @@ function arch_profile {
   fi
 }
 
+function debian_vimrc_restore_to_original {
+  # FIXME: useful for deprecated version of miaou-bash, to remove in a few months!
+  if [[ -f /etc/vim/vimrc.ORIGINAL ]]; then
+    rm -f /etc/vim/vimrc
+    mv /etc/vim/vimrc.ORIGINAL /etc/vim/vimrc
+    echo "vimrc restored to original!"
+  fi
+}
+
 function arch_vimrc {
   mkdir -p /etc/vim
   if ! grep -q '/etc/vim/vimrc.local' /etc/vimrc; then
@@ -110,6 +119,7 @@ function is_debian_like {
 
 function link_config_files {
   is_arch_like && arch_vimrc && arch_profile
+  is_debian_like && debian_vimrc_restore_to_original
 
   link_etc vim/vimrc.core
   link_etc vim/vimrc.miaou
@@ -132,7 +142,7 @@ function in_azerty_zone {
   [[ -L /etc/localtime ]] || return 4
 
   local zone
-  zone=$(readlink /etc/localtime)
+  zone=$(readlink -f /etc/localtime)
   zone="${zone#/usr/share/zoneinfo/}" # remove prefix
   for i in "${AZERTY_ZONES[@]}"; do [[ "$zone" == "$i" ]] && return; done
   return 5