[PATCH] rankmirrors: Fix fragile and currently broken argparse shifting

Johannes Löthberg johannes at kyriasis.com
Tue Dec 17 17:00:02 UTC 2019


Fixes FS#61923.

Signed-off-by: Johannes Löthberg <johannes at kyriasis.com>
---
 src/rankmirrors.sh.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/rankmirrors.sh.in b/src/rankmirrors.sh.in
index 08f7e28..7b78f37 100644
--- a/src/rankmirrors.sh.in
+++ b/src/rankmirrors.sh.in
@@ -154,33 +154,36 @@ while [[ $1 ]]; do
 			STDIN=1
 			shift
 		else
-			snum=1
 			for ((i=1 ; i<${#1}; i++)); do
 				case ${1:$i:1} in
 					h) usage ;;
 					m)
 						[[ $2 ]] || err "Must specify number.";
 						MAX_TIME="$2"
-						shift 2;;
+						shift
+						;;
 					t) TIMESONLY=1 ;;
 					v) VERBOSE=1 ;;
 					u)
 						CHECKURL=1;
 						[[ $2 ]] || err "Must specify URL.";
 						URL="$2";
-						snum=2;;
+						shift
+						;;
 					r)
 						[[ $2 ]] || err "Must specify repository name.";
 						TARGETREPO="$2";
-						snum=2;;
+						shift
+						;;
 					n)
 						[[ $2 ]] || err "Must specify number.";
 						NUM="$2";
-						snum=2;;
+						shift
+						;;
 					*) err "'$1' is an invalid argument." ;;
 				esac
 			done
-			shift $snum
+			shift
 		fi
 	elif [[ -f $1 ]]; then
 		FILE="1"
-- 
2.24.1


More information about the pacman-contrib mailing list