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

Update a few dialogs

Browse Source
This commit is contained in:
natemaia 2020-11-04 15:52:32 -08:00
parent eec9ce43f0
commit 204912e5c3
1 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
installer
View File

@ -510,7 +510,7 @@ select_login()
dlg LOGIN_TYPE menu "Login" "\nSelect what kind of login management to use." \ dlg LOGIN_TYPE menu "Login" "\nSelect what kind of login management to use." \
"xinit" "Console login with no graphical display manager" \ "xinit" "Console login with no graphical display manager" \
"lightdm" "Lightweight display manager (deepin and xfce default)" \ "lightdm" "Lightweight display manager (deepin and xfce default)" \
"gdm" "Gnome display manager (gnome default, go figure)" \ "gdm" "Gnome display manager (gnome default)" \
"sddm" "Simple desktop display manager (plasma and lxqt default)" || return 1 "sddm" "Simple desktop display manager (plasma and lxqt default)" || return 1
case $LOGIN_TYPE in case $LOGIN_TYPE in
@ -710,7 +710,7 @@ select_mirrors()
while :; do while :; do
c="" c=""
dlg codes check "Mirror Countries" "\nSelect which countries to use mirrors from.\n\nNot choosing any will result in an automatic selection." \ dlg codes check "Mirror Countries" "\nSelect which countries to use mirrors from.\n\nUse [Space] to toggle the selected item.\n\nNot choosing any will result in an automatic selection." \
AU Australia "$(ofn AU "$codes")" AT Austria "$(ofn AT "$codes")" \ AU Australia "$(ofn AU "$codes")" AT Austria "$(ofn AT "$codes")" \
BA "Bosnia Herzegovina" "$(ofn BA "$codes")" BY Belarus "$(ofn BY "$codes")" \ BA "Bosnia Herzegovina" "$(ofn BA "$codes")" BY Belarus "$(ofn BY "$codes")" \
BE Belgium "$(ofn BE "$codes")" BR Brazil "$(ofn BR "$codes")" \ BE Belgium "$(ofn BE "$codes")" BR Brazil "$(ofn BR "$codes")" \
@ -1562,26 +1562,22 @@ select_extra()
done <<< "$PARTS" done <<< "$PARTS"
fi fi
if (( ! PART_COUNT )); then while (( PART_COUNT )); do
msg "Mount Extra" "\nMounting Finished\n\nNo more partitions to mount, returning to main menu.\n" 2 part=''
else dlg part menu 'Mount Extra' "$_expart" 'done' 'finish mounting step' $PARTS || break
while (( PART_COUNT )); do if [[ $part == 'done' ]]; then
part='' break
dlg part menu 'Mount Extra' "$_expart" 'done' 'finish mounting step' $PARTS || break elif select_filesystem "$part" && select_mountpoint && part_mount "$part" "$EXMNT"; then
if [[ $part == 'done' ]]; then if (( BTRFS == 2 )); then
break btrfs_subvols "$part" "$EXMNT" || return 1
elif select_filesystem "$part" && select_mountpoint && part_mount "$part" "$EXMNT"; then
if (( BTRFS == 2 )); then
btrfs_subvols "$part" "$EXMNT" || return 1
fi
EXMNTS+="$part: $EXMNT "
[[ $EXMNT == '/usr' && $HOOKS != *usr* ]] && HOOKS+=" usr"
BTRFS=0
else
return 1
fi fi
done EXMNTS+="$part: $EXMNT "
fi [[ $EXMNT == '/usr' && $HOOKS != *usr* ]] && HOOKS+=" usr"
BTRFS=0
else
return 1
fi
done
return 0 return 0
} }