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

Fix mirror country selection

Browse Source
This commit is contained in:
natemaia 2020-05-18 12:48:31 -07:00
parent 711c2f9285
commit b6d3226628
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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.51 VER=2.1.52
# default values { # default values {
@ -41,7 +41,6 @@ typeset -a BASE_PKGS=(
"archlabs-fonts" "archlabs-fonts"
"archlabs-icons" "archlabs-icons"
"archlabs-keyring" "archlabs-keyring"
"archlabs-keyring"
"archlabs-scripts" "archlabs-scripts"
"archlabs-skel-base" "archlabs-skel-base"
"archlabs-themes" "archlabs-themes"
@ -2000,7 +1999,7 @@ install_packages()
fi fi
for i in ${LOGIN_PKGS[$LOGIN_TYPE]}; do for i in ${LOGIN_PKGS[$LOGIN_TYPE]}; do
loginpkg+=("$i") inpkg+=("$i")
done done
if [[ $PACSTRAP -eq 1 ]]; then if [[ $PACSTRAP -eq 1 ]]; then
@ -2036,7 +2035,7 @@ install_packages()
# install the packages chosen throughout the install plus any extras added # install the packages chosen throughout the install plus any extras added
chrun "pacman -S ${inpkg[*]} ${loginpkg[*]} $NEWSHELL --needed --noconfirm" 2> "$ERR" 2>&1 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 # bootloader packages
if [[ $BOOTLDR == 'grub' ]]; then if [[ $BOOTLDR == 'grub' ]]; then
@ -2235,7 +2234,7 @@ install_background()
[[ ! -d /etc/NetworkManager/system-connections ]] && net='netctl' [[ ! -d /etc/NetworkManager/system-connections ]] && net='netctl'
[[ $LUKS ]] && luks='cryptsetup' [[ $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 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 yesno 'Background Install' "$_bginstall" 'Pacstrap' 'Copy ISO' || PACSTRAP=0