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

Fix: lvm. New: erroshow(), select wm/de seperately. Change: use dialog --no-cancel

Browse Source
This commit is contained in:
natemaia
2018-12-17 00:57:44 -08:00
parent dd243e47f8
commit 2c136e1a47
18 changed files with 246 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/archlabs-installer
View File

@ -10,7 +10,7 @@
# immutable globals
readonly VER="1.7.48" # Installer version
readonly VER="1.7.52" # Installer version
readonly DIST="ArchLabs" # Linux distributor
readonly MNT="/mnt" # Install mountpoint
readonly ERR="/tmp/errlog" # Built-in error log
@ -25,8 +25,8 @@ main()
elif [[ $CURRENT_MENU != "main" ]]; then
SELECTED=1
CURRENT_MENU="main"
elif (( SELECTED < 9 )); then
((SELECTED++)) # increment the highlighted menu item
elif (( SELECTED < 10 )); then
((SELECTED++))
fi
tput civis
@ -39,9 +39,10 @@ main()
"4" "$_PrepLVM" \
"5" "$_PrepMount" \
"6" "$_PrepConfig" \
"7" "Pick Packages" \
"8" "Check Choices" \
"9" "$_PrepInstall")
"7" "Select WM/DE(s)" \
"8" "Select Packages" \
"9" "Check Choices" \
"10" "$_PrepInstall")
if [[ $WARN != true && $SELECTED =~ (2|5) ]]; then
WARN=true
@ -49,16 +50,44 @@ main()
fi
case $SELECTED in
1) device_tree ;;
2) partition || SELECTED=$((SELECTED - 1)) ;;
3) luks_menu || SELECTED=$((SELECTED - 1)) ;;
4) lvm_menu || SELECTED=$((SELECTED - 1)) ;;
5) mnt_menu || SELECTED=$((SELECTED - 1)) ;;
6) preinstall_checks && { cfg_menu || SELECTED=$((SELECTED - 1)); } ;;
7) preinstall_checks 1 && { select_packages || SELECTED=$((SELECTED - 2)); } ;;
8) preinstall_checks 1 && show_cfg ;;
9) preinstall_checks 1 && install ;;
*) yesno "$_CloseInst" "$_CloseInstBody" "Exit" "Back" && die
1)
device_tree
;;
2)
partition || SELECTED=$((SELECTED - 1))
;;
3)
luks_menu || SELECTED=$((SELECTED - 1))
;;
4)
lvm_menu || SELECTED=$((SELECTED - 1))
;;
5)
mnt_menu || SELECTED=$((SELECTED - 1))
;;
6)
if preinstall_checks; then
cfg_menu || SELECTED=$((SELECTED - 1))
fi
;;
7)
if preinstall_checks 1; then
select_wm_or_de || SELECTED=$((SELECTED - 1))
fi
;;
8)
if preinstall_checks 1; then
select_packages || SELECTED=$((SELECTED - 1))
fi
;;
9)
preinstall_checks 1 && show_cfg
;;
10)
preinstall_checks 1 && install
;;
*)
yesno "$_CloseInst" "$_CloseInstBody" "Exit" "Back" && die
esac
}