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

Cleanup a few small dialog text issues.

Browse Source
This commit is contained in:
natemaia 2020-06-13 13:26:54 -07:00
parent 2228c92e9c
commit 909043f751
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
installer
View File

@ -6,7 +6,7 @@
# AIF, Calamares, and the Arch Wiki.. Credit where credit is due # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
# shellcheck disable=SC2086,SC2046,SC2254,SC2164 # shellcheck disable=SC2086,SC2046,SC2254,SC2164
VER=2.1.54 VER=2.1.55
# default values { # default values {
@ -734,8 +734,10 @@ select_mirrors()
codes='' codes=''
MIRROR_URL='' MIRROR_URL=''
typeset -ga MIRROR_COUNTRY typeset -ga MIRROR_COUNTRY
typeset c=""
while :; do 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\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")" \
@ -765,7 +767,14 @@ select_mirrors()
US "United States" "$(ofn US "$codes")" UZ Uzbekistan "$(ofn UZ "$codes")" \ US "United States" "$(ofn US "$codes")" UZ Uzbekistan "$(ofn UZ "$codes")" \
VN Vietnam "$(ofn VN "$codes")" || return 1 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 done
for i in $codes; do for i in $codes; do
@ -1453,20 +1462,19 @@ select_boot()
local fs local fs
fs="$(fsck -N "$BOOT")" 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 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 yesno "Format Boot Partition" "\nIMPORTANT: $BOOT $_format" "Format" "Do Not Format" 1 || return 0
fi fi
case "$SYS" in case "$SYS" in
UEFI) UEFI) part_format "$BOOT" "vfat" 2 || return 1 ;;
BOOTFS='vfat' BIOS) part_format "$BOOT" "ext4" 2 || return 1 ;;
part_format "$BOOT" "vfat" 2 || return 1
;;
BIOS)
BOOTFS='ext4'
part_format "$BOOT" "ext4" 2 || return 1
;;
esac esac
return 0 return 0
} }
@ -3552,8 +3560,6 @@ if [[ ! -f /tmp/new ]]; then
chmod +x /usr/bin/installer chmod +x /usr/bin/installer
exec /usr/bin/installer "$@" exec /usr/bin/installer "$@"
fi fi
else
msg "Download Failed" "\nUnable to download the latest version, continuing with the current.\n" 2
fi fi
fi fi