xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update select_show()

Browse Source
This commit is contained in:
natemaia 2019-08-25 11:47:18 -07:00
parent 1547c4b403
commit 17780ed5f7
1 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
archlabs-installer
View File

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