From c9726373470dde710b455103923cdeb3ab43b54b Mon Sep 17 00:00:00 2001 From: Chris Renshaw Date: Sun, 22 Sep 2024 18:34:16 -0300 Subject: [PATCH] migrate.sh: clean up user argument parsing --- module/migrate.sh | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/module/migrate.sh b/module/migrate.sh index 0a2bf6c..d11f575 100644 --- a/module/migrate.sh +++ b/module/migrate.sh @@ -1,13 +1,10 @@ #!/bin/sh -case "$1" in - -h|--help|help) echo "sh migrate.sh [-f] [-o] [-a] [in-file] [out-file]"; exit 0;; -esac; - N=" "; case "$1" in + -h|--help|help) echo "sh migrate.sh [-f] [-o] [-a] [in-file] [out-file]"; exit 0;; -i|--install|install) INSTALL=1; shift;; *) echo "custom.pif.json migration script \ $N by osm0sis @ xda-developers $N";; @@ -27,15 +24,14 @@ grep_check_json() { grep -q "$1" "$target" && [ "$(grep_get_json $1 "$target")" ]; } -case "$1" in - -f|--force|force) FORCE=1; shift;; -esac; -case "$1" in - -o|--override|override) OVERRIDE=1; shift;; -esac; -case "$1" in - -a|--advanced|advanced) ADVANCED=1; shift;; -esac; +until [ -z "$1" -o -f "$1" ]; do + case "$1" in + -f|--force|force) FORCE=1; shift;; + -o|--override|override) OVERRIDE=1; shift;; + -a|--advanced|advanced) ADVANCED=1; shift;; + *) die "Invalid argument/file not found: $1";; + esac; +done; if [ -f "$1" ]; then FILE="$1";