diff --git a/archlabs-installer b/archlabs-installer index 93d88d5..9e4b01e 100755 --- a/archlabs-installer +++ b/archlabs-installer @@ -365,33 +365,24 @@ select_boot() select_show() { - local mnt="none" - local cmd="${BCMDS[$BOOTLDR]}" local pkgs="${USER_PKGS// / } ${PACKAGES// / }" - local exmnt="${EXMNT:-none}" - [[ $BOOT_PART ]] && mnt="/$BOOTDIR" + [[ $BOOT_PART ]] && local mnt="/$BOOTDIR" [[ $INSTALL_WMS == *dwm* ]] && pkgs="dwm st dmenu $pkgs" - pkgs="${pkgs// / }" + pkgs="${pkgs// / }" pkgs="${pkgs# }" msg "Show Configuration" " - ---------- PARTITION CONFIGURATION ------------ Root: ${ROOT_PART:-none} Boot: ${BOOT_PART:-${BOOT_DEV:-none}} + Mount: ${mnt:-none} Swap: ${SWAP_PART:-none} Size: ${SWAP_SIZE:-none} - Extra: ${EXMNTS:-$exmnt} + Extra: ${EXMNTS:-${EXMNT:-none}} Hooks: ${HOOKS:-none} LVM: ${LVM:-none} LUKS: ${LUKS:-none} ----------- BOOTLOADER CONFIGURATION ----------- - - Bootloader: ${BOOTLDR:-none} - Mountpoint: ${mnt:-none} - Command: ${cmd:-none} - ------------ SYSTEM CONFIGURATION ------------- @@ -401,20 +392,20 @@ select_show() Timezone: ${ZONE:-none}/${SUBZ:-none} ------------- USER CONFIGURATION -------------- +------------ USER CONFIGURATION --------------- - User: ${NEWUSER:-none} - Shell: ${MYSHELL:-none} - Session: ${LOGIN_WM:-none} - Autologin: ${AUTOLOGIN:-none} - DM or xinit: ${LOGIN_TYPE:-none} + Username: ${NEWUSER:-none} + Login Shell: ${MYSHELL:-none} + Login Session: ${LOGIN_WM:-none} + Autologin: ${AUTOLOGIN:-none} + Login Type: ${LOGIN_TYPE:-none} ------------- PACKAGES AND MIRRORS ------------- +----------- PACKAGE CONFIGURATION ------------- - Kernel: ${KERNEL:-none} - Sessions: ${INSTALL_WMS:-none} - Packages: ${USER_PKGS// / } ${PACKAGES// / } + Kernel: ${KERNEL:-none} + Bootloader: ${BOOTLDR:-none} + Packages: ${pkgs:-none} " }