diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rwxr-xr-x | latest-arch-mirrorlist | 13 | ||||
-rwxr-xr-x | reflector-simple | 18 |
4 files changed, 27 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = reflector-simple pkgdesc = Simple GUI wrapper for 'reflector'. - pkgver = 3.2 + pkgver = 3.3 pkgrel = 1 url = https://github.com/endeavouros-team/PKGBUILDS/tree/master/reflector-simple arch = any @@ -22,12 +22,12 @@ pkgbase = reflector-simple source = latest-arch-mirrorlist source = reflector-simple.svg source = show-location-info - sha512sums = f8b969e39a78edf16ffdf87086892e3b0256ca71ec0fce25695974528a8ac32d6ec126e21a9c72bb9512f30de2bee2bae8c4304593e6993b71bbdf93d8fd2d3f + sha512sums = f3cc0f7b34ae1538e9201287693239912798fa220a4b1ca357c9d0dea1a2cb0cd88e7ee82128ecd91141c019dd27cf8700f03ef1ada6efe940361543ef6be3c5 sha512sums = ac9d9313d85e3f90b7a5b1e9daa4bb16bfac4329336bc4a1e3924633a3c249c63c28603f35ede7f030a09cf52591d23fb2b0bdde7f2dbb4292855897220e54c2 sha512sums = aa149c8fc273e6a9fb5ddc38bde8a37b8fb095ec8877a324b957be57e156ef583adbed5988f0184ef06d5d09ec13e01e4a58b81fffef5d6d316405a3881895c3 sha512sums = 8b101caac9f38238d30f293176a09f1bb483ec1cdc474ef126ec087a8b548b50eee5c35617f0616dd1618e4dce72e14b70270f47658577e20e04a133405510aa sha512sums = c56090338b01f6eb251e3250d69d32c2b96c8393ebe921896de3ad1bd5c622c01ae637a09c6d0d0aa40e71d55be608a8d77066be05929d586723e79e0f24002c - sha512sums = 84fbd6a973dadaa8c11ddfb8ed505a332a8788f0d5e43cfcf234bba0441c0e4dde2534acb7ddbdf8d1422a2f57491ee79485ab4f7ebf4e6cf9d00aa12edb894b + sha512sums = 1b48d63ef98e51cd56ad3ffda5f27228eb0de5e5ddfdd15b58980b588748cbdd11bf6419e59188defccbdef1c33ab1aaaea8d4af327df470e5c641686912c413 sha512sums = 1d904cf0b7ae64052f70a77ff3a102e8741b54cd4bf81fce25eef2c3d475291aa79a3c8c39d63b13e28753d33ed4b0106bd896cd50952c26a7c79cbf5795157f sha512sums = be1a4eae09bde1666ad1cef7acfa310edf9dd2a4659fc7bde6da115b8f89ab0020993ea315025fae7b3ce34284d40eaae6378242ef46dda9aec4997ec2339334 @@ -4,7 +4,7 @@ pkgname=reflector-simple pkgdesc="Simple GUI wrapper for 'reflector'." -pkgver=3.2 +pkgver=3.3 pkgrel=1 arch=('any') license=('GPL') @@ -33,12 +33,12 @@ source=( $pkgname.svg show-location-info ) -sha512sums=('f8b969e39a78edf16ffdf87086892e3b0256ca71ec0fce25695974528a8ac32d6ec126e21a9c72bb9512f30de2bee2bae8c4304593e6993b71bbdf93d8fd2d3f' +sha512sums=('f3cc0f7b34ae1538e9201287693239912798fa220a4b1ca357c9d0dea1a2cb0cd88e7ee82128ecd91141c019dd27cf8700f03ef1ada6efe940361543ef6be3c5' 'ac9d9313d85e3f90b7a5b1e9daa4bb16bfac4329336bc4a1e3924633a3c249c63c28603f35ede7f030a09cf52591d23fb2b0bdde7f2dbb4292855897220e54c2' 'aa149c8fc273e6a9fb5ddc38bde8a37b8fb095ec8877a324b957be57e156ef583adbed5988f0184ef06d5d09ec13e01e4a58b81fffef5d6d316405a3881895c3' '8b101caac9f38238d30f293176a09f1bb483ec1cdc474ef126ec087a8b548b50eee5c35617f0616dd1618e4dce72e14b70270f47658577e20e04a133405510aa' 'c56090338b01f6eb251e3250d69d32c2b96c8393ebe921896de3ad1bd5c622c01ae637a09c6d0d0aa40e71d55be608a8d77066be05929d586723e79e0f24002c' - '84fbd6a973dadaa8c11ddfb8ed505a332a8788f0d5e43cfcf234bba0441c0e4dde2534acb7ddbdf8d1422a2f57491ee79485ab4f7ebf4e6cf9d00aa12edb894b' + '1b48d63ef98e51cd56ad3ffda5f27228eb0de5e5ddfdd15b58980b588748cbdd11bf6419e59188defccbdef1c33ab1aaaea8d4af327df470e5c641686912c413' '1d904cf0b7ae64052f70a77ff3a102e8741b54cd4bf81fce25eef2c3d475291aa79a3c8c39d63b13e28753d33ed4b0106bd896cd50952c26a7c79cbf5795157f' 'be1a4eae09bde1666ad1cef7acfa310edf9dd2a4659fc7bde6da115b8f89ab0020993ea315025fae7b3ce34284d40eaae6378242ef46dda9aec4997ec2339334' ) diff --git a/latest-arch-mirrorlist b/latest-arch-mirrorlist index a1f9eda039e4..9c91acd047c4 100755 --- a/latest-arch-mirrorlist +++ b/latest-arch-mirrorlist @@ -1,22 +1,27 @@ #!/bin/bash # Fetch the latest Arch mirrorlist. -# Use the file as target if given, otherwise save it to /tmp. -# Then display the full file path to stdout. +# Use the file as target if given, otherwise +# - save it to /tmp +# - then display the full file path to stdout Main() { local full_list="$1" + local file_given=no local ARCH_SITE=https://www.archlinux.org if [ -z "$full_list" ]; then full_list=/tmp/arch-mirrorlist-latest.$(date +%Y-%m-%d) + else + file_given=yes fi - curl -Lsm 10 -o "$full_list" $ARCH_SITE/mirrorlist/all || { return 1 } - echo "$full_list" + if [ "$file_given" = "no" ] ; then + echo "$full_list" + fi } Main "$@" diff --git a/reflector-simple b/reflector-simple index 97ec179283a1..f770a74f3874 100755 --- a/reflector-simple +++ b/reflector-simple @@ -521,11 +521,17 @@ BuildReflectorCommand() { fi reflector_cmd+=(--sort $(echo "${reflector_info[$ix]}" | tr -d '|')) # with echo incrementing ix with ++ does not work ((ix++)) + + xx="${reflector_info[$ix]}" + [ $xx -le 0 ] && xx=5 + export _MAX_MIRROR_LINES_TO_SHOW="$xx" + if [ "$use_number_instead_of_latest" = "yes" ] ; then - reflector_cmd+=(--number "${reflector_info[$((ix++))]}") + reflector_cmd+=(--number "$xx") else - reflector_cmd+=(--latest "${reflector_info[$((ix++))]}") + reflector_cmd+=(--latest "$xx") fi + ((ix++)) reflector_cmd+=(--download-timeout "${reflector_info[$((ix++))]}") # add optional free parameters to the command and save free params to file @@ -792,11 +798,11 @@ Main() { Verbose "Starting ranking..." "${reflector_cmd[@]}" 2>&1 > $tmpfile | tee $ranklog | { - local line="" max_lines=0 value=0 line_count=-2 + local line="" + local max_lines="$_MAX_MIRROR_LINES_TO_SHOW" + local value=0 + local line_count=-2 while read line ; do - if [[ "$line" == *"mirror(s) by"* ]]; then - max_lines=$(echo "$line" | sed -e 's/.*rating \(.*\) mirror.*/\1/') - fi if [[ "$line" != *"WARNING:"* ]]; then ((line_count++)) fi |