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

Remove syslinux UEFI install

Browse Source
This commit is contained in:
natemaia
2018-12-16 15:45:46 -08:00
parent acef733eda
commit f53ddd904b
12 changed files with 179 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/archlabs-installer
View File

@ -10,7 +10,7 @@
# immutable globals
readonly VER="1.7.40" # Installer version
readonly VER="1.7.43" # Installer version
readonly DIST="ArchLabs" # Linux distributor
readonly MNT="/mnt" # Install mountpoint
readonly ERR="/tmp/errlog" # Built-in error log
@ -18,13 +18,13 @@ readonly DBG="/tmp/debuglog" # Built-in error log
main()
{
if [[ $CURRENT_MENU != "main" ]]; then
if [[ $CURRENT_MENU != "main" && $SAVED ]]; then
CURRENT_MENU="main"
SELECTED=$((SAVED + 1))
unset SAVED
elif [[ $CURRENT_MENU != "main" ]]; then
SELECTED=1
CURRENT_MENU="main"
if [[ $SAVED ]]; then
SELECTED=$((SAVED + 1))
unset SAVED
fi
elif (( SELECTED < 8 )); then
((SELECTED++)) # increment the highlighted menu item
fi
@ -33,31 +33,29 @@ main()
SELECTED=$(dialog --cr-wrap --stdout --backtitle "$BT" \
--title " $_PrepTitle " --default-item $SELECTED \
--cancel-label "Exit" --menu "$_PrepBody" 0 0 0 \
"1" "$_PrepShowDev" "2" "$_PrepParts" \
"3" "$_PrepLUKS" "4" "$_PrepLVM" \
"5" "$_PrepMount" "6" "$_PrepConfig" \
"7" "Check Choices" "8" "$_PrepInstall")
"1" "$_PrepShowDev" \
"2" "$_PrepParts" \
"3" "$_PrepLUKS" \
"4" "$_PrepLVM" \
"5" "$_PrepMount" \
"6" "$_PrepConfig" \
"7" "Check Choices" \
"8" "$_PrepInstall")
if [[ $SELECTED ]]; then
if (( SELECTED == 8 )); then
preinstall_checks 1 || return 1
elif (( SELECTED == 6 )); then
preinstall_checks || return 1
elif [[ $WARN != true ]] && (( SELECTED == 2 || SELECTED == 5 )); then
msgbox "$_PrepTitle" "$_WarnMount"
WARN=true
fi
if [[ $WARN != true && $SELECTED =~ (2|5) ]]; then
WARN=true
msgbox "$_PrepTitle" "$_WarnMount"
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) cfg_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) show_cfg ;;
8) install ;;
8) preinstall_checks 1 && install ;;
*) yesno "$_CloseInst" "$_CloseInstBody" "Exit" "Back" && die
esac
}