More regression fixes

src/archlabs-installer

@@ -12,7 +12,7 @@
 # immutable variables {
 
 readonly DIST="ArchLabs"                      # Linux distributor
-readonly VER="1.6.70"                         # Installer version
+readonly VER="1.6.73"                         # Installer version
 readonly LIVE="liveuser"                      # Live session user
 readonly MNT="/mnt/install"                   # Install mountpoint
 readonly ERR="/tmp/errlog"                    # Built-in error log
@@ -48,7 +48,7 @@ elif [[ $(grep 'AuthenticAMD' /proc/cpuinfo) ]]; then
 fi
 
 # create associative array for SUBZONES[zone]
-declare -A SUBZONES
+declare -gA SUBZONES
 for zone in America Australia Asia Atlantic Africa Europe Indian Pacific Arctic Antarctica; do
     SUBZONES[$zone]="$(awk "/$zone\// {gsub(/$zone\//, \"\"); print \$3 \" \"\$1}" /usr/share/zoneinfo/zone.tab)"
 done
@@ -76,22 +76,22 @@ tz Swahili ke Swahili bw Tswana ph Filipino id Indonesian my Malay tm Turkmen bt
 lv Latvian md Moldavian mao Maori by Belarusian me Montenegrin mk Macedonian kh Khmer
 az Azerbaijani"
 
-declare -Ar BMNTS=(
+declare -Agr BMNTS=(
 [UEFI-grub]="/boot/efi" [UEFI-systemd-boot]="/boot" [BIOS-grub]="/boot"
 [BIOS-syslinux]="/boot" [UEFI-syslinux]="/boot"
 )
 
-declare -Ar BOOTLDRS=([BIOS]="grub ${BMNTS[BIOS-grub]} syslinux ${BMNTS[BIOS-syslinux]}"
+declare -Agr BOOTLDRS=([BIOS]="grub ${BMNTS[BIOS-grub]} syslinux ${BMNTS[BIOS-syslinux]}"
 [UEFI]="grub ${BMNTS[UEFI-grub]} systemd-boot ${BMNTS[UEFI-systemd-boot]} syslinux ${BMNTS[UEFI-syslinux]}"
 )
 
-declare -Ar FS_CMDS=(
+declare -Agr FS_CMDS=(
 [ext2]="mkfs.ext2 -q" [ext3]="mkfs.ext3 -q" [ext4]="mkfs.ext4 -q"
 [f2fs]="mkfs.f2fs" [jfs]="mkfs.jfs -q" [xfs]="mkfs.xfs -f" [nilfs2]="mkfs.nilfs2 -q"
 [ntfs]="mkfs.ntfs -q" [reiserfs]="mkfs.reiserfs -q" [vfat]="mkfs.vfat -F32"
 )
 
-declare -Ar FS_OPTS=([vfat]="" [ntfs]="" [ext2]="" [ext3]=""
+declare -Agr FS_OPTS=([vfat]="" [ntfs]="" [ext2]="" [ext3]=""
 [ext4]="dealloc - off discard - off nofail - off noacl - off relatime - off noatime - off nobarrier - off nodelalloc - off"
 [jfs]="discard - off errors=continue - off errors=panic - off nointegrity - off"
 [reiserfs]="acl - off nolog - off notail - off replayonly - off user_xattr - off"
@@ -103,39 +103,39 @@ declare -Ar FS_OPTS=([vfat]="" [ntfs]="" [ext2]="" [ext3]=""
 # }
 
 init_variables() {
-    BT="$DIST Installer - (x86_64) - Version $VER"
-    ROOT_PART=""
-    BOOT_DEVICE=""
-    BOOT_PART=""
-    BOOTLDR=""
-    EXTRA_MNT=""
-    EXTRA_MNTS=""
-    SWAP="none"
-    SWAP_SIZE="${SYS_MEM}M"
-    NEWUSER=""
-    USER_PASS=""
-    ROOT_PASS=""
-    LOGIN_WM=""
-    LOGIN_TYPE=""
-    INSTALL_WMS=""
-    KERNEL="linux"
-    WM_PACKAGES=""
-    EXTRA_PACKAGES=""
-    MKINIT_HOOKS="shutdown"
-    MIRROR_CMD="reflector --score 100 -l 50 -f 10 --sort rate"
+    declare -g BT="$DIST Installer - (x86_64) - Version $VER"
+    declare -g ROOT_PART=""
+    declare -g BOOT_DEVICE=""
+    declare -g BOOT_PART=""
+    declare -g BOOTLDR=""
+    declare -g EXTRA_MNT=""
+    declare -g EXTRA_MNTS=""
+    declare -g SWAP="none"
+    declare -g SWAP_SIZE="${SYS_MEM}M"
+    declare -g NEWUSER=""
+    declare -g USER_PASS=""
+    declare -g ROOT_PASS=""
+    declare -g LOGIN_WM=""
+    declare -g LOGIN_TYPE=""
+    declare -g INSTALL_WMS=""
+    declare -g KERNEL="linux"
+    declare -g WM_PACKAGES=""
+    declare -g EXTRA_PACKAGES=""
+    declare -g MKINIT_HOOKS="shutdown"
+    declare -g MIRROR_CMD="reflector --score 100 -l 50 -f 10 --sort rate"
 
-    IS_64BIT=false
-    AUTOLOGIN=false
-    CONFIG_DONE=false
-    SEPERATE_BOOT=false
+    declare -g IS_64BIT=false
+    declare -g AUTOLOGIN=false
+    declare -g CONFIG_DONE=false
+    declare -g SEPERATE_BOOT=false
 
-    declare -A BCMDS=(
+    declare -gA BCMDS=(
     [syslinux]="syslinux-install_update -iam"
     [grub]="grub-install --recheck --force"
     [systemd-boot]="bootctl --path=/boot install"
     )
 
-    declare -A FILES=(
+    declare -gA FILES=(
     [2]="/etc/X11/xorg.conf.d/00-keyboard.conf /etc/default/keyboard /etc/vconsole.conf"
     [3]="/etc/locale.conf /etc/default/locale"
     [4]="/etc/hostname /etc/hosts"
@@ -481,6 +481,7 @@ Boot Partition: $BOOT_PART
 
 Bootloader: $BOOTLDR
 Boot Mount: ${BMNTS[$SYS-$BOOTLDR]}
+Boot Command: ${BCMDS[$BOOTLDR]}
 
 Swap: $SWAP
 Extra: $EXTRA_MNTS