refactor debugging mocks

2 files changed, 25 insertions, 22 deletions

diff --git a/install.sh b/install.sh
index 9a96a3f..ff0f509 100755
--- a/install.sh
+++ b/install.sh
@@ -55,6 +55,8 @@ readonly GRUB_THEME_SED_CMD='s|^#GRUB_THEME=.*|GRUB_THEME=/boot/grub/themes/para
 
 Init()
 {
+# MOCK_INIT ; return 0 ;
+
   # sanity checks
   while [[ -z "$(GetStateVar 'XKBMAP')" ]] ||
         [[ -z "$(GetStateVar 'LANG'  )" ]] ||
@@ -79,20 +81,20 @@ Init()
 
 InitKeyring()
 {
-  if   [[ "$(GetStateVar 'KEYRING')" != 'ready' ]]
-  then pacman -Sy --noconfirm ${KEYRINGS[$(uname -m)]}
-       pacman-key --populate  ${KEYRINGS[$(uname -m)]//-keyring/}
-       pacman-key --refresh-keys
-       SetStateVar 'KEYRING' 'ready'
-  fi
+# MOCK_INITKEYRING ; return 0 ;
+
+  pacman -Sy --noconfirm ${KEYRINGS[$(uname -m)]}
+  pacman-key --populate  ${KEYRINGS[$(uname -m)]//-keyring/}
+  pacman-key --refresh-keys
+  SetStateVar 'KEYRING' 'ready'
 }
 
 NoticeCustomize() { WizardDlg "" --msgbox "${TR[notice_customize-${Lang}]}" 0 0 ; }
 
 SelectDefaults()
 {
-# ${MOCK_SELECTDEFAULTS}
-# ${MOCK_SELECTDEFAULTS_NO}
+# MOCK_SELECTDEFAULTS ; return 0 ;    # bypass SelectBase, SelectWmde, SelectEnv
+# MOCK_SELECTDEFAULTS_NO ; return 0 ; # exercise SelectBase, SelectWmde, SelectEnv
 
   # prompt to select the default installation configuration
   # (bypasses many other prompts)
@@ -113,7 +115,7 @@ SelectDefaults()
 
 SelectLogins()
 {
-# ${MOCK_SELECTLOGINS}
+# MOCK_SELECTLOGINS ; return 0 ;
 
   # prompt for root user password
   local pass='in valid' pass2='not valid'
@@ -132,7 +134,7 @@ SelectLogins()
   done
   SetStateVar 'ROOT_PASS' ${pass}
 
-# ${MOCK_SELECTLOGINS_NO}
+# MOCK_SELECTLOGINS_USER ; return 0 ;
 
   # prompt to create an unprivileged user login
   local dlg_title="${TR[dlg_user-${Lang}]/*) }"
@@ -166,7 +168,7 @@ SelectLogins()
 
 SelectBase()
 {
-# ${MOCK_SELECTBASE}
+# MOCK_SELECTBASE ; return 0 ;
 
   # checks to skip this stage per SelectDefaults()
   [[ -z "$(GetStateVar 'BASE')" || -z "$(GetStateVar 'INIT')" ]] || return 0
@@ -199,7 +201,7 @@ NoticeOptional() { WizardDlg "" --msgbox "${TR[notice_optional-${Lang}]}" 0 0 ;
 
 SelectBoot()
 {
-# ${MOCK_SELECTBOOT}
+# MOCK_SELECTBOOT ; return 0 ;
 
   # prompt to install GRUB
   (( $( WizardDlg "${TR[dlg_boot-${Lang}]}"                   \
@@ -210,7 +212,7 @@ SelectBoot()
 
 SelectWmde()
 {
-# ${MOCK_SELECTWMDE}
+# MOCK_SELECTWMDE ; return 0 ;
 
   # check to skip this stage per SelectDefaults()
   [[ -z "$(GetStateVar 'WMDE')" ]] && SetStateVar 'WMDE' 'cli' || return 0
@@ -231,7 +233,7 @@ SelectWmde()
 
 SelectEnv()
 {
-# ${MOCK_SELECTENV}
+# MOCK_SELECTENV ; return 0 ;
 
   [[ -z "$(GetStateVar 'HOSTNAME')" || -z "$(GetStateVar 'TIMEZONE')" || \
      -z "$(GetStateVar 'KEYMAP'  )" || -z "$(GetStateVar 'LOCALES' )" || \
diff --git a/session-common.sh.inc b/session-common.sh.inc
index a0f3b2b..ab7379d 100644
--- a/session-common.sh.inc
+++ b/session-common.sh.inc
@@ -303,14 +303,15 @@ LogError() # (source_file func_name line_n)
 
 ## debugging helpers ##
 
-readonly MOCK_SELECTDEFAULTS="SetStateVar 'INSTALL' \${DEF_INSTALL} ; SetStateVar 'BASE' \${DEF_PKG_SET} ; SetStateVar 'INIT' \${DEF_INIT} ; SetStateVar 'WMDE' \${DEF_WMDE} ; SetStateVar 'HOSTNAME' \${DEF_HOSTNAME} ; SetStateVar 'TIMEZONE' \${DEF_TIMEZONE} ; SetStateVar 'KEYMAP' \$(GetStateVar 'XKBMAP' ${DEF_KEYMAP} ) ; SetStateVar 'LOCALES' \$(GetStateVar 'LANG' \${DEF_LOCALE} ) ; SetStateVar 'LANGUAGE' \$(GetStateVar 'LANG' \${DEF_LANGUAGE}) ; return 0 ;"
-readonly MOCK_SELECTDEFAULTS_NO="return 0 ;"
-readonly MOCK_SELECTLOGINS_NO="SetStateVar 'USER_LOGIN' USER_LOGIN ; SetStateVar 'USER_PASS' USER_PASS ; return 0 ;"
-readonly MOCK_SELECTLOGINS="SetStateVar 'ROOT_PASS' ROOT_PASS \$(eval \${MOCK_SELECTLOGINS_NO})" ;
-readonly MOCK_SELECTBASE="SetStateVar 'INSTALL' \${DEF_INSTALL} ; SetStateVar 'BASE' \${DEF_PKG_SET} ; SetStateVar 'INIT' \${DEF_INIT} ; return 0 ;"
-readonly MOCK_SELECTBOOT="SetStateVar 'BOOT' 'grub' ; return 0 ;"
-readonly MOCK_SELECTWMDE="[[ -z \"\$(GetStateVar 'WMDE')\" ]] && SetStateVar 'WMDE' 'cli'"
-readonly MOCK_SELECTENV="SetStateVar 'HOSTNAME' \${DEF_HOSTNAME} ; SetStateVar 'TIMEZONE' \${DEF_TIMEZONE} ; SetStateVar 'KEYMAP' \$(GetStateVar 'XKBMAP' \${DEF_KEYMAP}) ; SetStateVar 'LOCALES' \$(GetStateVar 'LANG' \${DEF_LOCALE}) ; SetStateVar 'LANGUAGE' \$(GetStateVar 'LANG' \${DEF_LANGUAGE}) ; return 0"
+MOCK_INITKEYRING()       { SetStateVar 'KEYRING' 'ready' ; }
+MOCK_SELECTDEFAULTS()    { SetStateVar 'INSTALL' ${DEF_INSTALL} ; SetStateVar 'BASE' ${DEF_PKG_SET} ; SetStateVar 'INIT' ${DEF_INIT} ; SetStateVar 'WMDE' ${DEF_WMDE} ; SetStateVar 'HOSTNAME' ${DEF_HOSTNAME} ; SetStateVar 'TIMEZONE' ${DEF_TIMEZONE} ; SetStateVar 'KEYMAP' $(GetStateVar 'XKBMAP' ${DEF_KEYMAP} ) ; SetStateVar 'LOCALES' $(GetStateVar 'LANG' ${DEF_LOCALE} ) ; SetStateVar 'LANGUAGE' $(GetStateVar 'LANG' ${DEF_LANGUAGE}) ; }
+MOCK_SELECTDEFAULTS_NO() { : ; }
+MOCK_SELECTLOGINS()      { SetStateVar 'ROOT_PASS' ROOT_PASS ; MOCK_SELECTLOGINS_USER ; }
+MOCK_SELECTLOGINS_USER() { SetStateVar 'USER_LOGIN' USER_LOGIN ; SetStateVar 'USER_PASS' USER_PASS ; }
+MOCK_SELECTBASE()        { SetStateVar 'INSTALL' ${DEF_INSTALL} ; SetStateVar 'BASE' ${DEF_PKG_SET} ; SetStateVar 'INIT' ${DEF_INIT} ; }
+MOCK_SELECTBOOT()        { SetStateVar 'BOOT' 'grub' ; }
+MOCK_SELECTWMDE()        { [[ -n "$(GetStateVar 'WMDE')" ]] || SetStateVar 'WMDE' 'cli' ; }
+MOCK_SELECTENV()         { SetStateVar 'HOSTNAME' ${DEF_HOSTNAME} ; SetStateVar 'TIMEZONE' ${DEF_TIMEZONE} ; SetStateVar 'KEYMAP' $(GetStateVar 'XKBMAP' ${DEF_KEYMAP}) ; SetStateVar 'LOCALES' $(GetStateVar 'LANG' ${DEF_LOCALE}) ; SetStateVar 'LANGUAGE' $(GetStateVar 'LANG' ${DEF_LANGUAGE}) ; }
 
 
 ## translations for user-facing strings ##