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

Split package selection menu to it's own section

Browse Source
This commit is contained in:
natemaia 2018-12-16 21:07:55 -08:00
parent f53ddd904b
commit 23e7e82d83
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/archlabs-installer
View File

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

1
src/lib/dialogs.sh
View File

@ -154,7 +154,6 @@ cfg_menu()
select_mirrorcmd || return 1 select_mirrorcmd || return 1
select_wm_or_de || return 1 select_wm_or_de || return 1
select_packages || return 1
CONFIG_DONE=true CONFIG_DONE=true
return 0 return 0