From b6d3226628ff44891f01728487365ae74f347d2d Mon Sep 17 00:00:00 2001 From: natemaia Date: Mon, 18 May 2020 12:48:31 -0700 Subject: [PATCH] Fix mirror country selection --- installer | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/installer b/installer index 844d074..9b3b9c2 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.51 +VER=2.1.52 # default values { @@ -41,7 +41,6 @@ typeset -a BASE_PKGS=( "archlabs-fonts" "archlabs-icons" "archlabs-keyring" -"archlabs-keyring" "archlabs-scripts" "archlabs-skel-base" "archlabs-themes" @@ -2000,7 +1999,7 @@ install_packages() fi for i in ${LOGIN_PKGS[$LOGIN_TYPE]}; do - loginpkg+=("$i") + inpkg+=("$i") done if [[ $PACSTRAP -eq 1 ]]; then @@ -2036,7 +2035,7 @@ install_packages() # install the packages chosen throughout the install plus any extras added chrun "pacman -S ${inpkg[*]} ${loginpkg[*]} $NEWSHELL --needed --noconfirm" 2> "$ERR" 2>&1 - errshow 1 "chrun 'pacman -S ${inpkg[*]}${loginpkg[*]} $NEWSHELL --needed --noconfirm'" + errshow 1 "chrun 'pacman -S ${inpkg[*]} ${loginpkg[*]} $NEWSHELL --needed --noconfirm'" # bootloader packages if [[ $BOOTLDR == 'grub' ]]; then @@ -2235,7 +2234,7 @@ install_background() [[ ! -d /etc/NetworkManager/system-connections ]] && net='netctl' [[ $LUKS ]] && luks='cryptsetup' - install_mirror_country || AUTO_MIRROR=true + select_mirror_country || AUTO_MIRROR=true if hash rsync > /dev/null 2>&1; then # ask whether to pacstrap or copy if rsync is installed yesno 'Background Install' "$_bginstall" 'Pacstrap' 'Copy ISO' || PACSTRAP=0