shellcheck fixes

usr/bin/archboot-km.sh

@@ -69,7 +69,7 @@ _set_vconsole() {
     fi
     _abort_dialog || return 1
     _KEYMAPS=""
-    for i in $(${LIST_MAPS} | grep "^${_KEYMAP}" | grep -v '^carpalx' | grep -v 'defkey' | grep -v 'mac' | grep -v 'amiga' | grep -v 'sun' | grep -v 'atari'); do
+    for i in $(${_LIST_MAPS} | grep "^${_KEYMAP}" | grep -v '^carpalx' | grep -v 'defkey' | grep -v 'mac' | grep -v 'amiga' | grep -v 'sun' | grep -v 'atari'); do
         _KEYMAPS="${_KEYMAPS} ${i} -"
     done
     _CANCEL=""
@@ -82,7 +82,7 @@ _set_vconsole() {
     _S_NEXTITEM=2
 }
 
-mainmenu() {
+_mainmenu() {
     if [[ -n "${_S_NEXTITEM}" ]]; then
         _DEFAULT="--default-item ${_S_NEXTITEM}"
     else

usr/bin/archboot-tz.sh

@@ -9,7 +9,17 @@ else
     _EXIT="Exit"
 fi
 
-abort()
+# _dialog()
+# an el-cheapo dialog wrapper
+#
+# parameters: see dialog(1)
+# returns: whatever dialog did
+_dialog() {
+    dialog --backtitle "${_TITLE}" --aspect 15 "$@"
+    return $?
+}
+
+_abort()
 {
     _dialog --yesno "Abort Time And Date Setting?" 6 40 || return 0
     [[ -e /tmp/.timezone ]] && rm -f /tmp/.timezone
@@ -22,36 +32,26 @@ abort()
     exit 1
 }
 
-# _dialog()
+_dohwclock() {
-# an el-cheapo dialog wrapper
-#
-# parameters: see dialog(1)
-# returns: whatever dialog did
-_dialog() {
-    dialog --backtitle "${_TITLE}" --aspect 15 "$@"
-    return $?
-}
-
-dohwclock() {
     echo "0.0 0 0.0" > /etc/adjtime
     echo "0" >> /etc/adjtime
     [[ "${_HARDWARECLOCK}" = "UTC" ]] && echo UTC >> /etc/adjtime
     [[ "${_HARDWARECLOCK}" = "" ]] && echo LOCAL >> /etc/adjtime
     if [[ "${_HARDWARECLOCK}" = "UTC" ]]; then
         timedatectl set-local-rtc 0
-    DATE_PROGRAM=timedatectl
+        _DATE_PROGRAM=timedatectl
         # for setup script
         echo UTC > /tmp/.hardwareclock
     else
         timedatectl set-local-rtc 1
         #shellcheck disable=SC2209
-    DATE_PROGRAM=date
+        _DATE_PROGRAM=date
         # for setup script
         echo LOCAL > /tmp/.hardwareclock
     fi
 }
 
-dotimezone () {
+_dotimezone () {
     _SET_ZONE=""
     while ! [[ "${_SET_ZONE}" = "1" ]]; do
         _REGIONS="America - Europe - Africa - Asia - Australia -"
@@ -78,18 +78,18 @@ while ! [[ "${_SET_ZONE}" = "1" ]]; do
     done
 }
 
-dotimeset() {
+_dotimeset() {
     if [[ ! -s /tmp/.timezone ]]; then
         _dialog --msgbox "Error:\nYou have to select timezone first." 0 0
         _S_NEXTITEM="1"
         dotimezone || return 1
     fi
     _SET_TIME=""
-while [[ "${_SET_TIME}" == "" ]]; do
+    while [[ -z "${_SET_TIME}" ]]; do
         _HARDWARECLOCK=""
-    DATE_PROGRAM=""
+        _DATE_PROGRAM=""
         _dialog --yesno "Do you want to use UTC for your clock?\n\nIf you choose 'YES' UTC (recommended default) is used,\nwhich ensures daylightsaving is set automatically.\n\nIf you choose 'NO' Localtime is used, which means\nthe system will not change the time automatically.\nLocaltime is also prefered on dualboot machines,\nwhich also run Windows, because UTC may confuse it." 14 60 && _HARDWARECLOCK="UTC"
-    dohwclock
+        _dohwclock
         # check internet connection
         if ping -c1 www.google.com >/dev/null 2>&1; then
             if _dialog --yesno \
@@ -128,36 +128,36 @@ while [[ "${_SET_TIME}" == "" ]]; do
             timedatectl set-time "${_DATETIME}"
             _SET_TIME="1"
         fi
-    _dialog --cr-wrap --defaultno --yesno "Your current time and date is:\n$(${DATE_PROGRAM})\n\nDo you want to change it?" 0 0 && _SET_TIME=""
+        _dialog --cr-wrap --defaultno --yesno "Your current time and date is:\n$(${_DATE_PROGRAM})\n\nDo you want to change it?" 0 0 && _SET_TIME=""
     done
     _S_NEXTITEM="3"
 }
 
-mainmenu() {
+_mainmenu() {
     if [[ -n "${_S_NEXTITEM}" ]]; then
-        DEFAULT="--default-item ${_S_NEXTITEM}"
+        _DEFAULT="--default-item ${_S_NEXTITEM}"
     else
-        DEFAULT=""
+        _DEFAULT=""
     fi
     #shellcheck disable=SC2086
-    _dialog ${DEFAULT} --backtitle "${_TITLE}" --title " MAIN MENU " \
+    _dialog ${_DEFAULT} --backtitle "${_TITLE}" --title " MAIN MENU " \
                 --menu "Use the UP and DOWN arrows to navigate menus.\nUse TAB to switch between buttons and ENTER to select." 11 58 13 \
         "1" "Select Timezone" \
         "2" "Set Time and Date" \
         "3" "${_EXIT}" 2>${_ANSWER}
     case $(cat ${_ANSWER}) in
         "1")
-            dotimezone
+            _dotimezone
             ;;
         "2")
-            dotimeset
+            _dotimeset
             ;;
         "3")
             [[ -e /tmp/.tz-running ]] && rm /tmp/.tz-running
             clear
             exit 0 ;;
         *)
-            abort ;;
+            _abort ;;
     esac
 }
 
@@ -173,7 +173,7 @@ fi
 : >/tmp/.tz-running
 
 while true; do
-    mainmenu
+    _mainmenu
 done
 
 clear