refactor password entries

2 files changed, 38 insertions, 27 deletions

diff --git a/install.sh b/install.sh
index fdea14b..b7df875 100755
--- a/install.sh
+++ b/install.sh
@@ -116,55 +116,54 @@ SelectDefaults()
   fi
 }
 
-SelectLogins()
+_SetPass() # ("dlg_title" "prompt1" "prompt2") - assumes: $pass , sets: $pass
 {
-# MOCK_SELECTLOGINS ; return 0 ;
+  local dlg_title="$1"
+  local prompt1="$2"
+  local prompt2="$3"
+  local pass2='in valid' ; pass='contains space' ;
+  local err_msg=''
 
-  # prompt for root user password
-  local pass='in valid' pass2='not valid'
   until [[ "${pass}" == "${pass2}" ]]
-  do    pass='in valid' pass2='not valid'
+  do    pass='in valid' pass2='contains space'
         until ValidateId "${pass}"
-        do    pass=$(  WizardDlg "${TR[dlg_env-${Lang}]}"                       \
-                                 --passwordbox "${TR[root_pass-${Lang}]}"  8 56 )
+        do    pass=$( WizardDlg "${dlg_title}"  --passwordbox "${err_msg}${prompt1}" 8 56 )
               [[ -n "${pass}"  ]] || exit
         done
         until ValidateId "${pass2}"
-        do    pass2=$( WizardDlg "${TR[dlg_env-${Lang}]}"                       \
-                                 --passwordbox "${TR[root_pass2-${Lang}]}" 8 56 )
+        do    pass2=$( WizardDlg "${dlg_title}" --passwordbox "${prompt2}" 8 56 )
               [[ -n "${pass2}" ]] || exit
         done
+        err_msg="\Z1${TR[pass_err-${Lang}]}\Zn\n"
   done
+}
+
+SelectLogins()
+{
+# MOCK_SELECTLOGINS ; return 0 ;
+
+  # prompt for root user password
+  local pass
+  _SetPass "${TR[dlg_root-${Lang}]}" "${TR[root_pass-${Lang}]}" "${TR[root_pass2-${Lang}]}"
   SetStateVar 'ROOT_PASS' ${pass}
 
 # MOCK_SELECTLOGINS_USER ; return 0 ;
 
   # prompt to create an unprivileged user login
-  local dlg_title="${TR[dlg_user-${Lang}]/*) }"
-  (( $( WizardDlg "${dlg_title}" --yesno "${TR[user-${Lang}]}" 20 70 ) )) || return 0
+  local dlg_title="${TR[dlg_user-${Lang}]}"
+  (( $( WizardDlg "${dlg_title}" --yesno "${TR[user-${Lang}]}" 8 56 ) )) || return 0
 
-  # prompt for unprivileged user login and password
+  # prompt for unprivileged user login
   local login=''
-  dlg_title="${dlg_title/*) }" # trim "(Optional) "
-  pass='in valid' pass2='not valid'
+  dlg_title="${dlg_title/*) /}" # trim "(Optional) "
   until ValidateId "${login}"
   do    login=$( WizardDlg "${dlg_title}"                                          \
                            --inputbox "${TR[user_login-${Lang}]}" 8 56 ${login/ *} )
         [[ -n "${login}" ]] || exit
   done
-  until [[ "${pass}" == "${pass2}" ]]
-  do    pass='in valid' pass2='not valid'
-        until ValidateId "${pass}"
-        do    pass=$( WizardDlg "${dlg_title}"                                             \
-                                --passwordbox "${TR[user_pass-${Lang}]} '${login}':"  8 56 )
-              [[ -n "${pass}"  ]] || exit
-        done
-        until ValidateId "${pass2}"
-        do    pass2=$( WizardDlg "${dlg_title}"                                             \
-                                 --passwordbox "${TR[user_pass2-${Lang}]} '${login}':" 8 56 )
-              [[ -n "${pass2}" ]] || exit
-        done
-  done
+
+  # prompt for unprivileged user password
+  _SetPass "${dlg_title}" "${TR[user_pass-${Lang}]}" "${TR[user_pass2-${Lang}]}"
   SetStateVar 'USER_LOGIN' ${login}
   SetStateVar 'USER_PASS'  ${pass}
 }
diff --git a/translations.sh.inc b/translations.sh.inc
index e6394b5..1b3176a 100644
--- a/translations.sh.inc
+++ b/translations.sh.inc
@@ -115,6 +115,12 @@ declare -r -A TR=(
 
   ## install.sh::SelectLogins() ##
 
+  [dlg_root-en]="Enter a password for the 'root' administator:"
+  [dlg_root-eo]="Starigi 'root' Pasvorton:"
+  [dlg_root-es]="Establecer 'root' Contraseña:"
+  [dlg_root-gl]="Establecer 'root' Contrasinal:"
+  [dlg_root-pt]="Definir 'root' Senha:"
+
   [root_pass-en]="Enter a password for the 'root' administator:"
   [root_pass-eo]="Entajpu pasvorton por la 'root' ĉefuzanto:"
   [root_pass-es]="Inserta la contraseña para el 'root' administrador:"
@@ -127,6 +133,12 @@ declare -r -A TR=(
   [root_pass2-gl]="Repite o contrasinal para o 'root' administrador:"
   [root_pass2-pt]="Repita a senha para o 'root' administrador:"
 
+  [pass_err-en]="Those passwords did not match!"
+  [pass_err-eo]="Tiuj pasvortoj ne kongruis!"
+  [pass_err-es]="Esas contraseñas no coincidían!"
+  [pass_err-gl]="Estes contrasinais non coinciden!"
+  [pass_err-pt]="Essas senhas não batem!"
+
   [dlg_user-en]="(Optional) Create User Account"
   [dlg_user-eo]="(Optional) Kreiu Konton de Uazanto"
   [dlg_user-es]="(Opcional) Crear Cuenta de Usuario"