Clean up a number of functions, ensure make is installed for dwm

lang/english.trans

@@ -121,7 +121,7 @@ _KernelBody="\nSelect which kernel to use for the install."
 
 # base-devel
 _DevelTitle="Install base-devel packages"
-_DevelBody="\nDo you want base-devel installed for building AUR packages?"
+_DevelBody="\nDo you want base-devel installed for compiling and building packages?"
 
 # shell
 _ShellTitle="Choose Login Shell"

src/lib/boot.sh

@@ -1,23 +1,27 @@
 #!/usr/bin/bash
 
 # vim:ft=sh:fdm=marker:fmr={,}
+# shellcheck disable=2034
 
 # archlabs installer library script file
 # this file is not meant to be run directly
 # sourcing this file in a non bash shell is not advised
 
-declare -gA BCMDS=(
+# command used to install each bootloader, this can be modified later to fit the system
+declare -Ag BCMDS=(
 [syslinux]="syslinux-install_update -iam"
 [grub]="grub-install --recheck --force"
 [systemd-boot]="bootctl --path=/boot install"
 )
 
+# readonly boot partition mount points for each bootloader
 declare -Agr BMNTS=(
 [UEFI-grub]="/boot/efi" [UEFI-systemd-boot]="/boot" [BIOS-grub]="/boot"
 [BIOS-syslinux]="/boot" [UEFI-syslinux]="/boot"
 )
 
-declare -Agrx BOOTLDRS=(
+# readonly bootloader options with respective boot partition mountpoint
+declare -Agr BOOTLDRS=(
 [BIOS]="grub ${BMNTS[BIOS-grub]} syslinux ${BMNTS[BIOS-syslinux]}"
 [UEFI]="systemd-boot ${BMNTS[UEFI-systemd-boot]} grub ${BMNTS[UEFI-grub]} syslinux ${BMNTS[UEFI-syslinux]}"
 )

src/lib/dialogs.sh

@@ -57,6 +57,7 @@ declare -gA WM_EXT=(
 [openbox]="archlabs-obkey obconf archlabs-kickshaw tint2 archlabs-oblogout jgmenu tint2 archlabs-skippy-xd conky thunar termite libmpdclient jsoncpp archlabs-screenlock archlabs-paranoid archlabs-polybar rofi"
 )
 
+# files the user can edit during the final stage of install
 declare -gA EDIT_FILES=(
 [2]="/etc/X11/xorg.conf.d/00-keyboard.conf /etc/default/keyboard /etc/vconsole.conf"
 [3]="/etc/locale.conf /etc/default/locale"
@@ -67,7 +68,7 @@ declare -gA EDIT_FILES=(
 [8]="/etc/crypttab"
 [9]="/etc/default/grub"
 [10]="/etc/pacman.conf"
-[11]=""  # empty login files, we don't know /home/USER?/FILES?
+[11]="" # login files populated later, /home/USER?/FILES? ... lightdm?
 )
 
 # }

src/lib/install.sh

@@ -326,17 +326,25 @@ package_operations()
         find $MNT/boot/ -name 'syslinux*' -exec rm -rf '{}' \; >/dev/null 2>&1
     fi
 
-    # iputils, base-devel, and git are all needed and should always be installed separately
     chrun "pacman -Syyu --noconfirm"
+
+    # base-devel and git are the users choice
     if [[ $BASEDEV == true ]]; then
-        chrun "pacman -S iputils --noconfirm; pacman -S base-devel git --needed --noconfirm" 2>/dev/null
+        chrun "pacman -S iputils --noconfirm" 2>/dev/null
+        chrun "pacman -S base-devel git --needed --noconfirm" 2>/dev/null
     elif [[ $BASEDEV == false && $INSTALL_WMS =~ dwm ]]; then
-        chrun "pacman -S iputils git --noconfirm"
+        chrun "pacman -S iputils git make --noconfirm" 2>/dev/null
     else
-        chrun "pacman -S iputils --noconfirm"
+        # iputils is needed and should always be installed
+        chrun "pacman -S iputils --noconfirm" 2>/dev/null
     fi
+
+    # install chosen packages
     chrun "pacman -S $inpkg --needed --noconfirm"
+
+    # remove packages: installer, linux?, grub?
     chrun "pacman -Rs $rmpkg --noconfirm"
+
     return 0
 }
 

src/lib/luks.sh

@@ -6,10 +6,10 @@
 # this file is not meant to be run directly
 # sourcing this file in a non bash shell is not advised
 
-# shellcheck disable=2154
+# shellcheck disable=2154,2034
 
 declare -g LUKS=""
-declare -gx LUKS_DEV=""
+declare -g LUKS_DEV=""
 declare -g LUKS_PART=""
 declare -g LUKS_PASS=""
 declare -g LUKS_UUID=""

src/lib/utils.sh

@@ -154,6 +154,8 @@ system_checks()
         rmmod wl >/dev/null 2>&1
         modprobe wl >/dev/null 2>&1
         export BROADCOM_WL=true
+        printf "\nLoading wifi kernel modules please wait...\n"
+        sleep 2
     fi
 
     if ! curl -s --head 'https://www.archlinux.org/mirrorlist/all/' | sed '1q' | grep -qw '200'; then