From 909043f7514bc70e4beb54e82fa16d7f70832981 Mon Sep 17 00:00:00 2001
From: natemaia <natemaia10@gmail.com>
Date: Sat, 13 Jun 2020 13:26:54 -0700
Subject: [PATCH] Cleanup a few small dialog text issues.

---
 installer | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/installer b/installer
index 2ca3b10..998529b 100755
--- a/installer
+++ b/installer
@@ -6,7 +6,7 @@
 # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
 
 # shellcheck disable=SC2086,SC2046,SC2254,SC2164
-VER=2.1.54
+VER=2.1.55
 
 # default values {
 
@@ -734,8 +734,10 @@ select_mirrors()
 	codes=''
 	MIRROR_URL=''
 	typeset -ga MIRROR_COUNTRY
+	typeset c=""
 
 	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." \
 			AU Australia "$(ofn AU "$codes")"            AT Austria "$(ofn AT "$codes")" \
 			BA "Bosnia Herzegovina" "$(ofn BA "$codes")" BY Belarus "$(ofn BY "$codes")" \
@@ -765,7 +767,14 @@ select_mirrors()
 			US "United States" "$(ofn US "$codes")"      UZ Uzbekistan "$(ofn UZ "$codes")" \
 			VN Vietnam "$(ofn VN "$codes")" || return 1
 
-		yesno "Mirror Countries" "\nConfirm the following countries: $(for i in $codes; do printf "%s, " "${COUNTRIES[$i]}"; done)" && break
+		for i in $codes; do
+			if [[ $c ]]; then
+				c+=", ${COUNTRIES[$i]}"
+			else
+				c="${COUNTRIES[$i]}"
+			fi
+		done
+		yesno "Mirror Countries" "\nConfirm the following countries: $c" && break
 	done
 
 	for i in $codes; do
@@ -1453,20 +1462,19 @@ select_boot()
 
 	local fs
 	fs="$(fsck -N "$BOOT")"
-	BOOTFS="$fs"
+
+	case "$SYS" in
+		UEFI) BOOTFS='vfat' ;;
+		BIOS) BOOTFS='ext4' ;;
+	esac
+
 	if ([[ $SYS == 'BIOS' ]] && grep -q 'ext[34]' <<< "$fs") || ([[ $SYS == 'UEFI' ]] && grep -q 'fat' <<< "$fs"); then
 		yesno "Format Boot Partition" "\nIMPORTANT: $BOOT $_format" "Format" "Do Not Format" 1 || return 0
 	fi
 
 	case "$SYS" in
-		UEFI)
-			BOOTFS='vfat'
-			part_format "$BOOT" "vfat" 2 || return 1
-			;;
-		BIOS)
-			BOOTFS='ext4'
-			part_format "$BOOT" "ext4" 2 || return 1
-			;;
+		UEFI) part_format "$BOOT" "vfat" 2 || return 1 ;;
+		BIOS) part_format "$BOOT" "ext4" 2 || return 1 ;;
 	esac
 	return 0
 }
@@ -3552,8 +3560,6 @@ if [[ ! -f /tmp/new ]]; then
 			chmod +x /usr/bin/installer
 			exec /usr/bin/installer "$@"
 		fi
-	else
-		msg "Download Failed" "\nUnable to download the latest version, continuing with the current.\n" 2
 	fi
 fi