diff --git a/src/archlabs-installer b/src/archlabs-installer index abab2ad..6031d6e 100755 --- a/src/archlabs-installer +++ b/src/archlabs-installer @@ -10,7 +10,7 @@ # immutable globals -readonly VER="1.7.43" # Installer version +readonly VER="1.7.44" # Installer version readonly DIST="ArchLabs" # Linux distributor readonly MNT="/mnt" # Install mountpoint readonly ERR="/tmp/errlog" # Built-in error log @@ -25,7 +25,7 @@ main() elif [[ $CURRENT_MENU != "main" ]]; then SELECTED=1 CURRENT_MENU="main" - elif (( SELECTED < 8 )); then + elif (( SELECTED < 9 )); then ((SELECTED++)) # increment the highlighted menu item fi @@ -39,8 +39,9 @@ main() "4" "$_PrepLVM" \ "5" "$_PrepMount" \ "6" "$_PrepConfig" \ - "7" "Check Choices" \ - "8" "$_PrepInstall") + "7" "Pick Packages" \ + "8" "Check Choices" \ + "9" "$_PrepInstall") if [[ $WARN != true && $SELECTED =~ (2|5) ]]; then WARN=true @@ -54,8 +55,9 @@ main() 4) lvm_menu || SELECTED=$((SELECTED - 1)) ;; 5) mnt_menu || SELECTED=$((SELECTED - 1)) ;; 6) preinstall_checks && { cfg_menu || SELECTED=$((SELECTED - 1)); } ;; - 7) show_cfg ;; - 8) preinstall_checks 1 && install ;; + 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 esac } diff --git a/src/lib/dialogs.sh b/src/lib/dialogs.sh index d690497..82b8b46 100644 --- a/src/lib/dialogs.sh +++ b/src/lib/dialogs.sh @@ -154,7 +154,6 @@ cfg_menu() select_mirrorcmd || return 1 select_wm_or_de || return 1 - select_packages || return 1 CONFIG_DONE=true return 0