ouroboros-gorup/obos-fi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed from strings to vars and fixed some more issues

Browse source
This commit is contained in:
TessaiMusa 2021-10-20 20:48:21 +05:30
parent d169270f58
commit 04ec79a37e
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
archfi
View file

@ -739,7 +739,7 @@ installmenu(){
options=() options=()
#options+=("${txtselectmirrorsbycountry}" "(${txtoptional})") #options+=("${txtselectmirrorsbycountry}" "(${txtoptional})")
options+=("${txteditmirrorlist}" "(${txtoptional})") options+=("${txteditmirrorlist}" "(${txtoptional})")
options+=("Filter mirrorlist" "Reflector") options+=("${txtfiltermirrorlist}" "reflector")
options+=("${txtinstallarchlinux}" "pacstrap") options+=("${txtinstallarchlinux}" "pacstrap")
options+=("${txtconfigarchlinux}" "") options+=("${txtconfigarchlinux}" "")
sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtunmount}" --default-item "${nextitem}" 0 0 0 \ sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtunmount}" --default-item "${nextitem}" 0 0 0 \
@ -755,8 +755,8 @@ installmenu(){
${EDITOR} /etc/pacman.d/mirrorlist ${EDITOR} /etc/pacman.d/mirrorlist
nextitem="${txtinstallarchlinux}" nextitem="${txtinstallarchlinux}"
;; ;;
"Filter mirrorlist") "${txtfiltermirrorlist}")
rankmirrorlist filtermirrorlist
nextitem="${txtinstallarchlinux}" nextitem="${txtinstallarchlinux}"
;; ;;
"${txtinstallarchlinux}") "${txtinstallarchlinux}")
@ -794,25 +794,27 @@ selectmirrorsbycountry() {
sed "s/^\(Server .*\)/\#\1/;/^## $country/N; {s/^\(## .*\n\)\#Server \(.*\)/\1Server \2/}" < /etc/pacman.d/mirrorlist.backup > /etc/pacman.d/mirrorlist sed "s/^\(Server .*\)/\#\1/;/^## $country/N; {s/^\(## .*\n\)\#Server \(.*\)/\1Server \2/}" < /etc/pacman.d/mirrorlist.backup > /etc/pacman.d/mirrorlist
} }
rankmirrorlist() { filtermirrorlist() {
command -v reflector > /dev/null || { command -v reflector > /dev/null || {
echo "pacman -S --noconfirm reflector" echo "pacman -S --noconfirm reflector"
pacman -S --noconfirm reflector pacman -S --noconfirm reflector
} }
options=() options=()
options+=("Filter mirrorlist" "") options+=("Filter mirrorlist" "")
options+=("Edit /etc/xdg/reflector/reflector.conf" "") options+=("${txtedit//%1/reflector.conf}" "")
sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtback}" --default-item "Filter mirrorlist" 0 0 0 \ sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtback}" --default-item "Filter mirrorlist" 0 0 0 \
"${options[@]}" \ "${options[@]}" \
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
case ${sel} in case ${sel} in
"Filter mirrorlist") "${txtfiltermirrorlist}")
clear
echo "systemctl start reflector.service" echo "systemctl start reflector.service"
systemctl start reflector.service systemctl start reflector.service
pressanykey pressanykey
;; ;;
"Edit /etc/xdg/reflector/reflector.conf") "${txtedit//%1/reflector.conf}")
${EDITOR} /etc/xdg/reflector/reflector.conf ${EDITOR} /etc/xdg/reflector/reflector.conf
filtermirrorlist
;; ;;
esac esac
} }
@ -1921,6 +1923,7 @@ loadstrings(){
txtselectmirrorsbycountry="Select mirrors by country" txtselectmirrorsbycountry="Select mirrors by country"
txtselectcountry="Select country" txtselectcountry="Select country"
txteditmirrorlist="Edit mirrorlist" txteditmirrorlist="Edit mirrorlist"
txtfiltermirrorlist="Filter mirrorlist"
txtinstallarchlinux="Install Arch Linux" txtinstallarchlinux="Install Arch Linux"
txtinstallarchlinuxkernel="Kernel" txtinstallarchlinuxkernel="Kernel"
txtinstallarchlinuxfirmwares="Firmwares" txtinstallarchlinuxfirmwares="Firmwares"