albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changes to the 'makepkgd.conf' drop-in file for 'makepkg' that optimizes the building process (only applicable to KDE Plasma Custom & Gnome Custom Setups).

Browse source 
Changed the way "reflector" presents the Countries list, before obtaining the available mirrors.
This commit is contained in:
Jane Doe 2024-05-17 18:22:09 +00:00
parent bfaadb9250
commit 669517bad9
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Amelia Installer # Amelia Installer
# Version: 4.2 # Version: 4.3
set -euo pipefail set -euo pipefail
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
@ -3643,8 +3643,6 @@ ${purple}###${nc} LUKS Encryption ${purple}###${nc}
opt_pcmn (){ opt_pcmn (){
local prompt="PacMan" local prompt="PacMan"
countries="$(reflector --list-countries | sed 's|[0-9].*||' | sed 's|-.*||' | sed 's|Country.*||')"
list=(${countries})
sleep 0.5 sleep 0.5
NC " NC "
_______________________ _______________________
@ -3653,16 +3651,15 @@ ${purple}###${nc} Optimize PacMan ${purple}###${nc}
" "
YELLOW " YELLOW "
> Select a country for your Arch Mirrors: > Select a Country for your Arch Mirrors:
"
for countries in "${list[*]}"; do ### [Hit ${nc}'l'${yellow} to list Countries, then ${nc}'down'${yellow} to search or ${nc}'q'${yellow} to quit] "
echo "${countries}"
done
BLUE " BLUE "
Enter country name or code ${bwhite}(Empty for Defaults)${blue}: "
Enter country name or country code ${bwhite}(Empty for Defaults)${blue}: "
read -r -p " read -r -p "
==> " COUNTRY ==> " COUNTRY
echo echo
@ -3673,10 +3670,14 @@ Enter country name or code ${bwhite}(Empty for Defaults)${blue}: "
==> [${green}Default Mirrors OK${nc}] " ==> [${green}Default Mirrors OK${nc}] "
elif [[ "${COUNTRY}" == "l" ]]; then
reflector --list-countries | more
return 1
elif [[ -n "${COUNTRY}" ]] ; then elif [[ -n "${COUNTRY}" ]] ; then
NC " NC "
" "
if reflector --verbose -c "${COUNTRY}" -l 10 -p https -f 10 --sort rate --save /etc/pacman.d/mirrorlist; then if reflector --verbose -c "${COUNTRY}" -l 10 -p https -f 10 --sort rate --save /etc/pacman.d/mirrorlist 2>/dev/null; then
sleep 0.5 sleep 0.5
NC " NC "
@ -4268,7 +4269,8 @@ NRG
BUILDENV=(!distcc color ccache check !sign) BUILDENV=(!distcc color ccache check !sign)
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto) OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
COMPRESSGZ=(pigz -c -f -n) COMPRESSGZ=(pigz -c -f -n)
COMPRESSBZ2=(pbzip2 -c -f)' | tee /etc/makepkg.conf.d/makepkgd.conf && COMPRESSBZ2=(pbzip2 -c -f)
COMPRESSZST=(zstd -c -T0 --ultra -20 --auto-threads=logical -)' | tee /etc/makepkg.conf.d/makepkgd.conf &&
ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime && ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime &&
hwclock --systohc && hwclock --systohc &&
echo ${HOSTNAME} > /etc/hostname && echo ${HOSTNAME} > /etc/hostname &&
@ -4461,7 +4463,8 @@ NRG
BUILDENV=(!distcc color ccache check !sign) BUILDENV=(!distcc color ccache check !sign)
OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto) OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
COMPRESSGZ=(pigz -c -f -n) COMPRESSGZ=(pigz -c -f -n)
COMPRESSBZ2=(pbzip2 -c -f)' | tee /etc/makepkg.conf.d/makepkgd.conf && COMPRESSBZ2=(pbzip2 -c -f)
COMPRESSZST=(zstd -c -T0 --ultra -20 --auto-threads=logical -)' | tee /etc/makepkg.conf.d/makepkgd.conf &&
ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime && ln -sf /usr/share/zoneinfo/$(curl -s http://ip-api.com/line?fields=timezone) /etc/localtime &&
hwclock --systohc && hwclock --systohc &&
echo ${HOSTNAME} > /etc/hostname && echo ${HOSTNAME} > /etc/hostname &&