From 859b25f8af367b2e4e3dabc236c099ca85fe77ac Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Sun, 16 Feb 2020 00:01:42 -0500
Subject: housekeeping

---
 configs/profile/root-image/root/.language.sh | 37 +++++++++++++++-------------
 1 file changed, 20 insertions(+), 17 deletions(-)

(limited to 'configs/profile/root-image/root/.language.sh')

diff --git a/configs/profile/root-image/root/.language.sh b/configs/profile/root-image/root/.language.sh
index 53f69ee..f3f6950 100755
--- a/configs/profile/root-image/root/.language.sh
+++ b/configs/profile/root-image/root/.language.sh
@@ -4,20 +4,22 @@ readonly TIMEOUT=30
 readonly H=15
 readonly W=40
 readonly N_ITEMS=10
-readonly DEFAULT_LANG='en_US.UTF-8'
+
 readonly LANG_TITLE="System language selection"
 readonly LANG_PROMPT="Choose your language:"
-readonly DEFAULT_KEYMAP='us'
+readonly LANG_DEFAULT='en_US.UTF-8'
 readonly KEYMAP_TITLE="System keymap selection"
 readonly KEYMAP_PROMPT="Choose your keymap:"
-readonly -a LANGUAGES=( 'en_US.UTF-8' "English"              \
-                        'eo'          "Esperanto"            \
-                        'es_ES.UTF-8' "Spanish"              \
-                        'fr_FR.UTF-8' "French"               \
-                        'gl_ES.UTF-8' "Galego"               \
-                        'it_IT.UTF-8' "Italian"              \
-                        'pl_PL.UTF-8' "Polish"               \
-                        'pt_BR.UTF-8' "Brazilian-Portuguese" )
+readonly KEYMAP_DEFAULT='us'
+
+readonly -a LANGUAGES=( 'en_US.UTF-8' "English"    \
+                        'eo'          "Esperanto"  \
+                        'fr_FR.UTF-8' "French"     \
+                        'gl_ES.UTF-8' "Galego"     \
+                        'it_IT.UTF-8' "Italian"    \
+                        'pl_PL.UTF-8' "Polish"     \
+                        'pt_BR.UTF-8' "Portuguese" \
+                        'es_ES.UTF-8' "Spanish"    )
 readonly -a ESPERANTO_LANG_PACKS=(  'iceweasel-l10n-es-eo'                      )
 readonly -a SPANISH_LANG_PACKS=(    'iceweasel-l10n-es-ar' 'icedove-l10n-es-ar'
                                     'iceweasel-l10n-es-cl'
@@ -28,6 +30,7 @@ readonly -a GALEGO_LANG_PACKS=(     'iceweasel-l10n-gl'    'icedove-l10n-gl'
 readonly -a ITALIAN_LANG_PACKS=(    'iceweasel-l10n-it'    'icedove-l10n-it'    )
 readonly -a POLISH_LANG_PACKS=(     'iceweasel-l10n-pl'    'icedove-l10n-pl'    )
 readonly -a PORTUGUESE_LANG_PACKS=( 'iceweasel-l10n-pt-br' 'icedove-l10n-pt-br' )
+
 readonly -a KEYMAPS=( 'af'          "Afrikaans-Lang"   \
                       'al'          "Albanian"         \
                       'am'          "Amharic"          \
@@ -142,12 +145,12 @@ Prompt() # (title , prompt , default_option , options)
 }
 
 
-### prompt for language if not already selected ###
+## prompt for language if not already selected ##
 
 language=$(grep 'LANG=' /root/.codecheck | cut -d '=' -f 2)
 if   [ "${language// /}" == '_UNDEFINED_' ]
-then language=$(Prompt "$LANG_TITLE" "$LANG_PROMPT" $DEFAULT_LANG "${LANGUAGES[@]}")
-     [ "${language}" == "" ] && language=$DEFAULT_LANG
+then language=$(Prompt "$LANG_TITLE" "$LANG_PROMPT" $LANG_DEFAULT "${LANGUAGES[@]}")
+     [ "${language}" == "" ] && language=$LANG_DEFAULT
      logger "$0: selected language='$language'"
 
      # prepare locale
@@ -164,12 +167,12 @@ then language=$(Prompt "$LANG_TITLE" "$LANG_PROMPT" $DEFAULT_LANG "${LANGUAGES[@
      for installer_dir in ${INSTALLER_DIRS[@]}
      do  case ${language} in
               'eo') echo "${ESPERANTO_LANG_PACKS[@]}"  >> ${installer_dir}/packages ;;
-              'es') echo "${SPANISH_LANG_PACKS[@]}"    >> ${installer_dir}/packages ;;
               'fr') echo "${FRENCH_LANG_PACKS[@]}"     >> ${installer_dir}/packages ;;
               'gl') echo "${GALEGO_LANG_PACKS[@]}"     >> ${installer_dir}/packages ;;
               'it') echo "${ITALIAN_LANG_PACKS[@]}"    >> ${installer_dir}/packages ;;
               'pl') echo "${POLISH_LANG_PACKS[@]}"     >> ${installer_dir}/packages ;;
               'pt') echo "${PORTUGUESE_LANG_PACKS[@]}" >> ${installer_dir}/packages ;;
+              'es') echo "${SPANISH_LANG_PACKS[@]}"    >> ${installer_dir}/packages ;;
          esac
      done
 
@@ -178,12 +181,12 @@ then language=$(Prompt "$LANG_TITLE" "$LANG_PROMPT" $DEFAULT_LANG "${LANGUAGES[@
 fi
 
 
-### prompt for X11 keymap if not already selected ###
+## prompt for X11 keymap if not already selected ##
 
 keymap=$(grep 'XKBMAP=' /root/.codecheck | cut -d '=' -f 2)
 if   [ "${keymap// /}" == '_UNDEFINED_' ]
-then keymap=$(Prompt "$KEYMAP_TITLE" "$KEYMAP_PROMPT" $DEFAULT_KEYMAP "${KEYMAPS[@]}")
-     [ "${keymap}" == "" ] && keymap=$DEFAULT_KEYMAP
+then keymap=$(Prompt "$KEYMAP_TITLE" "$KEYMAP_PROMPT" $KEYMAP_DEFAULT "${KEYMAPS[@]}")
+     [ "${keymap}" == "" ] && keymap=$KEYMAP_DEFAULT
      logger "$0: selected keymap='$keymap'"
 
      # set keymap
-- 
cgit v1.2.2