added selection of mirrors by country

Signed-off-by: Michael Picht <mipi@fsfe.org>
This commit is contained in:
Michael Picht 2019-12-07 08:30:45 +01:00
parent 7bb766696c
commit fc132433d4

23
archfi
View file

@ -725,6 +725,7 @@ installmenu(){
nextitem=${1} nextitem=${1}
fi fi
options=() options=()
options+=("${txtselectmirrorsbycountry}" "(${txtoptional})")
options+=("${txteditmirrorlist}" "(${txtoptional})") options+=("${txteditmirrorlist}" "(${txtoptional})")
options+=("${txtinstallarchlinux}" "pacstrap base linux") options+=("${txtinstallarchlinux}" "pacstrap base linux")
options+=("${txtconfigarchlinux}" "") options+=("${txtconfigarchlinux}" "")
@ -733,6 +734,10 @@ installmenu(){
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
case ${sel} in case ${sel} in
"${txtselectmirrorsbycountry}")
selectmirrorsbycountry
nextitem="${txtinstallarchlinux}"
;;
"${txteditmirrorlist}") "${txteditmirrorlist}")
${EDITOR} /etc/pacman.d/mirrorlist ${EDITOR} /etc/pacman.d/mirrorlist
nextitem="${txtinstallarchlinux}" nextitem="${txtinstallarchlinux}"
@ -752,6 +757,23 @@ installmenu(){
fi fi
} }
selectmirrorsbycountry() {
cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.backup
items=$( sed -n "/^##.*/N; {s/^## \(.*\)\nServer.*/\1/p}" < /etc/pacman.d/mirrorlist.backup | sort -u )
options=()
IFS_ORIG=$IFS
IFS=$'\n'
for item in ${items}; do
options+=("${item}" "")
done
IFS=$IFS_ORIG
country=$(whiptail --backtitle "${APPTITLE}" --title "${txtselectcountry}" --menu "" 0 0 0 "${options[@]}" 3>&1 1>&2 2>&3)
if [ "$?" != "0" ]; then
return 1
fi
sed "s/^\(Server .*\)/\#\1/;/^## $country/N; {s/^\(## .*\n\)\#Server \(.*\)/\1Server \2/}" < /etc/pacman.d/mirrorlist.backup > /etc/pacman.d/mirrorlist
}
installbase(){ installbase(){
clear clear
echo "pacstrap /mnt base linux" echo "pacstrap /mnt base linux"
@ -1719,6 +1741,7 @@ loadstrings(){
txtarchinstallmenu="Arch Install Menu" txtarchinstallmenu="Arch Install Menu"
txtselectmirrorsbycountry="Select mirrors by country"
txteditmirrorlist="Edit mirrorlist" txteditmirrorlist="Edit mirrorlist"
txtinstallarchlinux="Install Arch Linux" txtinstallarchlinux="Install Arch Linux"
txtconfigarchlinux="Config Arch Linux" txtconfigarchlinux="Config Arch Linux"