correct options processing

Author: d-w-moore

test_harness/single_node/docker_container_driver.sh

@@ -21,59 +21,55 @@ EXPLICIT_WORKDIR=""
 INTERACTIVE_OPTION=""
 VERBOSITY=0
 
-# Options in force:
-
-# -V            (extra verbosity).  Prints out useful stuff including VERSION information
-# -u USERNAME   run test in container as this USERNAME
-
-# Options currently used for troubleshooting only:
-
-# -i            invoke container with -i and -t
-# -c            verbosely prints the container name
-# -L            leaks the container (i.e. does not kill it after the test run)
-# -p "/path/value"         sets the IRODS_CONTROL_PATH for changing where iRODS server control scripts are looked for
-# -r "remove_option_value" (default: "--rm") may be used to suppress ("") automatic removal of container when stopped
-# -w "explicit_workdir"    specify a work directory when running the test
+usage() {
+echo "Usage:
+    $0 [options] /external/path/to/script"
+
+echo 'Options :
+    -V            (extra verbosity).  Prints out useful stuff including VERSION information
+    -u USERNAME   run test in container as this USERNAME
+    -i            invoke container with -i and -t
+    -c            verbosely prints the container name
+    -L            leaks the container (i.e. does not kill it after the test run)
+    -p "/path/value"         sets the IRODS_CONTROL_PATH for changing where iRODS server control scripts are looked for
+    -r "remove_option_value" (default: "--rm") may be used to suppress ("") automatic removal of container when stopped
+    -w "explicit_workdir"    specify a work directory when running the test
+'
+exit 2
+}
 
 while [[ $1  = -* ]]; do
     if [ "$1" = -i ]; then
         INTERACTIVE_OPTION="-it"
         shift
-    fi
-    if [ "$1" = -V ]; then
+    elif [ "$1" = -V ]; then
         VERBOSITY=1
         shift
-    fi
-    if [ "$1" = -c ]; then
+    elif [ "$1" = -c ]; then
         ECHO_CONTAINER=1
         shift
-    fi
-    if [ "$1" = -L ]; then
+    elif [ "$1" = -L ]; then
         KILL_TEST_CONTAINER=0
         shift
-    fi
-    if [ "$1" = -p ]; then
+    elif [ "$1" = -p ]; then
         IRODS_CONTROL_PATH="$2"
         shift 2
-    fi
-    if [ "$1" = -u ]; then
+    elif [ "$1" = -u ]; then
         RUN_AS_USER="$2"
         shift 2
-    fi
-    if [ "$1" = -r ]; then
+    elif [ "$1" = -r ]; then
         REMOVE_OPTION="$2"
         shift 2
-    fi
-    if [ "$1" = -w ]; then
+    elif [ "$1" = -w ]; then
         EXPLICIT_WORKDIR="$2"
         shift 2
+    else
+        usage
     fi
 done
 
 if [ "$1" = "" ]; then
-    echo >&2 "Usage: $0 [options] /path/to/script"
-    echo >&2 "With options: [-L] to leak, [-u username] to run as non-root user"
-    exit 1
+    usage
 fi
 
 DIR=$(dirname "$0")