From 204912e5c3905c8343d505e08390ca320801fff0 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Wed, 4 Nov 2020 15:52:32 -0800
Subject: [PATCH] Update a few dialogs

---
 installer | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/installer b/installer
index de8f1fc..1e6bcd1 100755
--- a/installer
+++ b/installer
@@ -510,7 +510,7 @@ select_login()
 	dlg LOGIN_TYPE menu "Login" "\nSelect what kind of login management to use." \
 		"xinit"   "Console login with no graphical display manager" \
 		"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
 
 	case $LOGIN_TYPE in
@@ -710,7 +710,7 @@ select_mirrors()
 
 	while :; do
 		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")" \
 			BA "Bosnia Herzegovina" "$(ofn BA "$codes")" BY Belarus "$(ofn BY "$codes")" \
 			BE Belgium "$(ofn BE "$codes")"              BR Brazil "$(ofn BR "$codes")" \
@@ -1562,26 +1562,22 @@ select_extra()
 		done <<< "$PARTS"
 	fi
 
-	if (( ! PART_COUNT )); then
-		msg "Mount Extra" "\nMounting Finished\n\nNo more partitions to mount, returning to main menu.\n" 2
-	else
-		while (( PART_COUNT )); do
-			part=''
-			dlg part menu 'Mount Extra' "$_expart" 'done' 'finish mounting step' $PARTS || break
-			if [[ $part == 'done' ]]; then
-				break
-			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
+	while (( PART_COUNT )); do
+		part=''
+		dlg part menu 'Mount Extra' "$_expart" 'done' 'finish mounting step' $PARTS || break
+		if [[ $part == 'done' ]]; then
+			break
+		elif select_filesystem "$part" && select_mountpoint && part_mount "$part" "$EXMNT"; then
+			if (( BTRFS == 2 )); then
+				btrfs_subvols "$part" "$EXMNT" || return 1
 			fi
-		done
-	fi
+			EXMNTS+="$part: $EXMNT "
+			[[ $EXMNT == '/usr' && $HOOKS != *usr* ]] && HOOKS+=" usr"
+			BTRFS=0
+		else
+			return 1
+		fi
+	done
 	return 0
 }