doctor complete

lib/doctor.bash

@@ -14,43 +14,62 @@ function debian_version {
   grep ^VERSION= /etc/os-release | cut -d= -f2
 }
 
-function doctor_distribution {
+function zone_info {
+  if [[ -e /etc/localtime ]]; then
+    realpath /etc/localtime --relative-to=/usr/share/zoneinfo
+  else
+    echo '<undefined>'
+  fi
+}
+
+function azerty_mode {
+  if [[ -f /etc/vim/vimrc.azerty ]]; then echo true; else echo false; fi
+}
 
-  echo --distribution--
+function print_value {
+  printf "%25s = %s\n" "$@"
+}
+
+function doctor_distribution {
+  echo '-- distribution --'
   fetch_distro_like
-  echo "DISTRO FAMILY = $DISTRO_LIKE"
+  print_value 'FAMILY' "$DISTRO_LIKE"
   distro_name=$(distribution)
-  echo "DISTRO NAME   = $distro_name"
+  print_value 'NAME' "$distro_name"
   if [[ $distro_name == 'debian' ]]; then
-    echo "DISTRO VERSION= $(debian_version)"
+    print_value 'VERSION' "$(debian_version)"
   fi
 }
 
 function doctor_miaou {
-  echo --miaou--
-  echo "MIAOU_BASH_DIR        = $MIAOU_BASH_DIR"
-  fetch_mode
-  echo "MIAOU_BASH_MODE       = $MIAOU_BASH_MODE"
-  echo "MIAOU_BASH_MODE_OWNER = $MIAOU_BASH_MODE_OWNER"
-
+  echo '-- miaou --'
+  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 "AZERTY mode" "$(azerty_mode)"
 }
-function doctor_console {
-  echo --console--
-  echo "BASH_VERSION = $(bash_version)"
-  echo "LANG = ${LANG:-}"
-  echo "TERM = ${TERM:-}"
+
+function doctor_environment {
+  echo '-- environment --'
+  print_value BASH_VERSION "$(bash_version)"
+  print_value TERM "${TERM:-}"
+  print_value LANG "${LANG:-}"
+  print_value REGION "$(zone_info)"
+  print_value USER "$USER"
+  print_value HOSTNAME "$(hostname -f)"
 }
 
-function doctor_tests {
-  echo --tests--
+function doctor_test_suite {
+  echo '-- test suite --'
   "$MIAOU_BASH_DIR"/test/miaou-bash.test.bash 2>&1
 }
 # MAIN
 
 source "$MIAOU_BASH_DIR"/lib/functions.bash
 
-echo == MIAOU DOCTOR ==
+echo '== MIAOU DOCTOR =='
+fetch_mode
 doctor_distribution
-doctor_console
+doctor_environment
 doctor_miaou
-doctor_tests
+doctor_test_suite

locales/fr.sh

@@ -1,10 +1,10 @@
 # shellcheck disable=SC2034
 
 # note the extra ' ' (compare with locale en) => raise issue fr.po
-MSG_UNBOUND_VARIABLE_REGEX='^(.*): ligne ([0-9]+): (.*) : variable sans liaison$'
+MSG_UNBOUND_VARIABLE_REGEX='^(.*): ligne ([0-9]+): (.*) ?: variable sans liaison$'
 
 # extra ' ' + weird NBSP (removed programmatically) => raise issue fr.po too
-MSG_COMMAND_NOT_FOUND_REGEX='^(.*): ligne ([0-9]+): (.*) : commande introuvable$'
+MSG_COMMAND_NOT_FOUND_REGEX='^(.*): ligne ([0-9]+): (.*) ?: commande introuvable$'
 
 MSG_FILE_NOT_FOUND_REGEX='^(.*): ligne ([0-9]+): (.*): Aucun fichier ou dossier de ce (nom|type)$'
 MSG_SOURCE_NOT_FOUND_REGEX='^(.*): ligne ([0-9]+): (.*): Aucun fichier ou dossier de ce (nom|type)$'