Fixed getopt bug

sudocurse · Jun 29, 2020 · 56dde00 · 56dde00
1 parent 9379c9d
commit 56dde00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/draft-rm-install b/draft-rm-install
@@ -16,10 +16,11 @@ usage() {
     echo "Type '$0 --help' or '$0 -h' to see this message."
 }
 
-while getopts ":y" option; do
+while getopts ":y:" option; do
     case $option in
     y)
         answer="Y"
+        shift
         ;;
     *)
         usage
@@ -28,7 +29,7 @@ while getopts ":y" option; do
     esac
 done
 
-if [ $OPTIND != 1 ]; then
+if [ $OPTIND < 1 || $OPTIND > 2 ]; then
     usage
     exit 1
 fi

diff --git a/draft-rm-uninstall b/draft-rm-uninstall
@@ -17,6 +17,7 @@ while getopts ":y" option; do
     case $option in
     y)
         answer="Y"
+        shift
         ;;
     *)
         usage
@@ -25,7 +26,7 @@ while getopts ":y" option; do
     esac
 done
 
-if [ $OPTIND != 1 ]; then
+if [ $OPTIND < 1 || $OPTIND > 2 ]; then
     usage
     exit 1
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ while getopts ":y" option; do @@
         case $option in
         y)
             answer="Y"
+            shift
             ;;
         *)
             usage
@@ Expand All / @@ -25,7 +26,7 @@ while getopts ":y" option; do @@
         esac
     done
-    if [ $OPTIND != 1 ]; then
+    if [ $OPTIND < 1 || $OPTIND > 2 ]; then
         usage
         exit 1
     fi
@@ Expand Down @@