Merge pull request #28 from Liupold/ordered-flag-pre-check

Fixes #26
Liupold · Aug 2, 2020 · 4f6dcda · 4f6dcda
2 parents 660effe + 8c3c821
commit 4f6dcda
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/pidswallow b/pidswallow
@@ -146,18 +146,34 @@ loop() {
 
 TEMP=$(getopt -o 'Vghlt:s:v:' --long 'verbose,glue,help,loop,toggle:,swallow:,vomit:' \
         -n 'pidswallow' -- "$@")
-eval set -- "${TEMP}"; unset TEMP
+
+# precheck
+eval set -- "${TEMP}"
 while true; do
         case "$1" in
-                '-h' | '--help' )
-                        echo "$usage" && exit 0;;
                 '-V'|'--verbose')
                         verbose=1
                         [ "$verbose" -eq 1 ] && echo "SWALLOWABLE: \"$swallowable\""
                         shift; continue;;
                 '-g'|'--glue')
                         glue=1
                         shift; continue;;
+                '--')
+                        shift; break;;
+                *)
+                        shift; continue;;
+        esac
+done
+
+eval set -- "${TEMP}"; unset TEMP
+while true; do
+        case "$1" in
+                '-V'|'--verbose')
+                        shift; continue;;
+                '-g'|'--glue')
+                        shift; continue;;
+                '-h' | '--help' )
+                        echo "$usage" && exit 0;;
                 '-t'|'--toggle')
                         toggle "$2" || exit "$?"
                         shift 2; continue;;