rename parameters

usr/lib/archboot/installer/base.sh

@@ -19,9 +19,9 @@ _VC="VC${_VC_NUM}"
 # install stages
 _S_SRC=0         # choose mirror
 _S_MKFS=0        # formatting
-S_MKFSAUTO=0    # auto fs part/formatting
+_S_MKFSAUTO=0    # auto fs part/formatting
 # menu item tracker- autoselect the next item
-NEXTITEM=""
+_NEXTITEM=""
 # To allow choice in script set EDITOR=""
 EDITOR=""
 

usr/lib/archboot/installer/bootloader.sh

@@ -978,8 +978,8 @@ install_bootloader() {
         fi
     fi
     if [[ -z "${S_BOOTLOADER}" ]]; then
-        NEXTITEM="7"
+        _NEXTITEM="7"
     else
-        NEXTITEM="8"
+        _NEXTITEM="8"
     fi
 }

usr/lib/archboot/installer/mountpoints.sh

@@ -249,7 +249,7 @@ mountpoints() {
     printk on
     DIALOG --infobox "Partitions were successfully mounted.\nContinuing in 3 seconds ..." 0 0
     sleep 3
-    NEXTITEM="5"
+    _NEXTITEM="5"
     S_MKFS=1
 }
 

usr/lib/archboot/installer/network.sh

@@ -182,6 +182,6 @@ donetwork() {
         DIALOG --infobox "Link is up. Continuing in 3 seconds ..." 3 60
         sleep 3
     fi
-    NEXTITEM="2"
+    _NEXTITEM="2"
     S_NET=1
 }

usr/lib/archboot/installer/pacman.sh

@@ -8,7 +8,7 @@ getsource() {
     S_SRC=0
     PACMAN_CONF=""
     if [[ -e "${LOCAL_DB}" ]]; then
-        NEXTITEM="4"
+        _NEXTITEM="4"
         local_pacman_conf
         DIALOG --msgbox "Setup is running in <Local mode>.\nOnly Local package database is used for package installation.\n\nIf you want to switch to <Online mode>, you have to delete /var/cache/pacman/pkg/archboot.db and rerun this step." 10 70
         S_SRC=1
@@ -24,7 +24,7 @@ getsource() {
 # args: none
 # returns: nothing
 select_mirror() {
-    NEXTITEM="2"
+    _NEXTITEM="2"
     ## Download updated mirrorlist, if possible (only on x86_64)
     if [[ "${RUNNING_ARCH}" == "x86_64" ]]; then
         dialog --infobox "Downloading latest mirrorlist ..." 3 40
@@ -53,7 +53,7 @@ select_mirror() {
         # only return one line for the mirror.
         SYNC_URL=$(grep -E -o "${_server}.*" "${MIRRORLIST}" | head -n1)
     fi
-    NEXTITEM="4"
+    _NEXTITEM="4"
     echo "Using mirror: ${SYNC_URL}" > "${_LOG}"
     #shellcheck disable=SC2027,SC2086
     echo "Server = "${SYNC_URL}"" >> /etc/pacman.d/mirrorlist
@@ -116,7 +116,7 @@ update_environment() {
 # params: none
 # returns: 1 on error
 prepare_pacman() {
-    NEXTITEM="5"
+    _NEXTITEM="5"
     # Set up the necessary directories for pacman use
     [[ ! -d "${_DESTDIR}/var/cache/pacman/pkg" ]] && mkdir -p "${_DESTDIR}/var/cache/pacman/pkg"
     [[ ! -d "${_DESTDIR}/var/lib/pacman" ]] && mkdir -p "${_DESTDIR}/var/lib/pacman"
@@ -189,7 +189,7 @@ install_packages() {
     PACKAGES="${PACKAGES//  / }"
     DIALOG --yesno "Next step will install the following packages for a minimal system:\n${PACKAGES}\n\nYou can watch the progress on your ${_VC} console.\n\nDo you wish to continue?" 12 75 || return 1
     run_pacman
-    NEXTITEM="6"
+    _NEXTITEM="6"
     chroot_mount
     # automagic time!
     # any automatic configuration should go here

usr/lib/archboot/installer/partition.sh

@@ -164,5 +164,5 @@ partition() {
     done
     # update dmraid
     _dmraid_update
-    NEXTITEM="3"
+    _NEXTITEM="3"
 }

usr/lib/archboot/installer/storage.sh

@@ -2,11 +2,11 @@
 # created by Tobias Powalowski <tpowa@archlinux.org>
 # menu for raid, lvm and encrypt
 create_special() {
-    NEXTITEM=""
+    _NEXTITEM=""
     SPECIALDONE=0
     while [[ "${SPECIALDONE}" == "0" ]]; do
-        if [[ -n "${NEXTITEM}" ]]; then
+        if [[ -n "${_NEXTITEM}" ]]; then
-            DEFAULT="--default-item ${NEXTITEM}"
+            DEFAULT="--default-item ${_NEXTITEM}"
         else
             DEFAULT=""
         fi
@@ -17,7 +17,7 @@ create_special() {
             "2" "Manage LVM2" \
             "3" "Manage Luks encryption" \
             "4" "Return to Previous Menu" 2>"${_ANSWER}" || CANCEL="1"
-        NEXTITEM="$(cat "${_ANSWER}")"
+        _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
             "1")
                 _createmd ;;
@@ -30,19 +30,19 @@ create_special() {
         esac
     done
     if [[ "${CANCEL}" == "1" ]]; then
-        NEXTITEM="3"
+        _NEXTITEM="3"
     else
-        NEXTITEM="4"
+        _NEXTITEM="4"
     fi
 }
 
 # menu for md creation
 _createmd() {
-    NEXTITEM=""
+    _NEXTITEM=""
     MDDONE=0
     while [[ "${MDDONE}" == "0" ]]; do
-        if [[ -n "${NEXTITEM}" ]]; then
+        if [[ -n "${_NEXTITEM}" ]]; then
-            DEFAULT="--default-item ${NEXTITEM}"
+            DEFAULT="--default-item ${_NEXTITEM}"
         else
             DEFAULT=""
         fi
@@ -54,7 +54,7 @@ _createmd() {
             "3" "Reset Software Raid" \
             "4" "Raid Help" \
             "5" "Return to Previous Menu" 2>"${_ANSWER}" || CANCEL="1"
-        NEXTITEM="$(cat "${_ANSWER}")"
+        _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
             "1")
                 RAID_PARTITION=""
@@ -70,16 +70,16 @@ _createmd() {
                 MDDONE=1 ;;
         esac
     done
-    NEXTITEM="1"
+    _NEXTITEM="1"
 }
 
 # menu for lvm creation
 _createlvm() {
-    NEXTITEM=""
+    _NEXTITEM=""
     LVMDONE=0
     while [[ "${LVMDONE}" == "0" ]]; do
-        if [[ -n "${NEXTITEM}" ]]; then
+        if [[ -n "${_NEXTITEM}" ]]; then
-            DEFAULT="--default-item ${NEXTITEM}"
+            DEFAULT="--default-item ${_NEXTITEM}"
         else
             DEFAULT=""
         fi
@@ -92,7 +92,7 @@ _createlvm() {
             "4" "Reset Logical Volume" \
             "5" "LVM Help" \
             "6" "Return to Previous Menu" 2>"${_ANSWER}" || CANCEL="1"
-        NEXTITEM="$(cat "${_ANSWER}")"
+        _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
             "1")
                 _createpv ;;
@@ -108,16 +108,16 @@ _createlvm() {
                 LVMDONE=1 ;;
         esac
     done
-    NEXTITEM="2"
+    _NEXTITEM="2"
 }
 
 # menu for luks creation
 _createluks() {
-    NEXTITEM=""
+    _NEXTITEM=""
     LUKSDONE=0
     while [[ "${LUKSDONE}" == "0" ]]; do
-        if [[ -n "${NEXTITEM}" ]]; then
+        if [[ -n "${_NEXTITEM}" ]]; then
-            DEFAULT="--default-item ${NEXTITEM}"
+            DEFAULT="--default-item ${_NEXTITEM}"
         else
             DEFAULT=""
         fi
@@ -128,7 +128,7 @@ _createluks() {
             "2" "Reset Luks Encryption completely" \
             "3" "Luks Help" \
             "4" "Return to Previous Menu" 2>"${_ANSWER}" || CANCEL="1"
-        NEXTITEM="$(cat "${_ANSWER}")"
+        _NEXTITEM="$(cat "${_ANSWER}")"
         case $(cat "${_ANSWER}") in
             "1")
                 _luks ;;
@@ -140,5 +140,5 @@ _createluks() {
                 LUKSDONE=1 ;;
         esac
     done
-    NEXTITEM="3"
+    _NEXTITEM="3"
 }