Handle multiple options in configure #33

Signed-off-by: Jono Yang <[email protected]>

Author: JonoYang

README.rst

@@ -76,12 +76,12 @@ To generate requirements.txt:
 
     python etc/scripts/gen_requirements.py -s venv/lib/python<version>/site-packages/
 
-Replace \<version\> with the version number of the Python being used.
+Replace \<version\> with the version number of the Python being used, for example: ``venv/lib/python3.6/site-packages/``
 
 To generate requirements-dev.txt after requirements.txt has been generated:
 
 .. code-block:: bash
-    ./configure --dev
+    ./configure --init --dev
     source venv/bin/activate
     python etc/scripts/gen_requirements_dev.py -s venv/lib/python<version>/site-packages/
 

configure

@@ -164,12 +164,18 @@ CFG_DEV_MODE=0
 CFG_REQUIREMENTS=$REQUIREMENTS
 NO_INDEX="--no-index"
 
-case "$CLI_ARGS" in
-    --help)    cli_help;;
-    --clean)   clean;;
-    --dev)     CFG_REQUIREMENTS="$DEV_REQUIREMENTS" && CFG_DEV_MODE=1;;
-    --init)    NO_INDEX="";;
-esac
+# We are using getopts to parse option arguments that start with "-"
+while getopts :-: optchar; do
+    case "${optchar}" in
+        -)
+            case "${OPTARG}" in
+                help  ) cli_help;;
+                clean ) clean;;
+                dev   ) CFG_REQUIREMENTS="$DEV_REQUIREMENTS" && CFG_DEV_MODE=1;;
+                init  ) NO_INDEX="";;
+            esac;;
+    esac
+done
 
 PIP_EXTRA_ARGS="$PIP_EXTRA_ARGS $NO_INDEX"
 

configure.bat

@@ -66,19 +66,24 @@ set CFG_DEV_MODE=0
 set "CFG_REQUIREMENTS=%REQUIREMENTS%"
 set "NO_INDEX=--no-index"
 
-if "%1" EQU "--help"   (goto cli_help)
-if "%1" EQU "--clean"  (goto clean)
-if "%1" EQU "--dev"    (
-    set "CFG_REQUIREMENTS=%DEV_REQUIREMENTS%"
-    set CFG_DEV_MODE=1
-)
-if "%1" EQU "--init"   (
-    set "NO_INDEX= "
-)
-if "%1" EQU "--python" (
-    echo "The --python option is now DEPRECATED. Use the PYTHON_EXECUTABLE environment"
-    echo "variable instead. Run configure --help for details."
-    exit /b 0
+:again
+if not "%1" == "" (
+    if "%1" EQU "--help"   (goto cli_help)
+    if "%1" EQU "--clean"  (goto clean)
+    if "%1" EQU "--dev"    (
+        set "CFG_REQUIREMENTS=%DEV_REQUIREMENTS%"
+        set CFG_DEV_MODE=1
+    )
+    if "%1" EQU "--init"   (
+        set "NO_INDEX= "
+    )
+    if "%1" EQU "--python" (
+        echo "The --python option is now DEPRECATED. Use the PYTHON_EXECUTABLE environment"
+        echo "variable instead. Run configure --help for details."
+        exit /b 0
+    )
+    shift
+    goto again
 )
 
 set "PIP_EXTRA_ARGS=%PIP_EXTRA_ARGS% %NO_INDEX%"