Correct configure scripts

These were no longer working

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

configure

@@ -67,34 +67,6 @@ if [[ "$CFG_QUIET" == "" ]]; then
 fi
 
 
-################################
-# Main command line entry point
-main() {
-    CFG_REQUIREMENTS=$REQUIREMENTS
-    NO_INDEX="--no-index"
-    
-    # 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 ) find_python && clean;;
-                    dev   ) CFG_REQUIREMENTS="$DEV_REQUIREMENTS";;
-                    init  ) NO_INDEX="";;
-                esac;;
-        esac
-    done
-
-    PIP_EXTRA_ARGS="$PIP_EXTRA_ARGS $NO_INDEX"
-
-    find_python
-    create_virtualenv "$VIRTUALENV_DIR"
-    install_packages "$CFG_REQUIREMENTS"
-    . "$CFG_BIN_DIR/activate"
-}
-
-
 ################################
 # Find a proper Python to run
 # Use environment variables or a file if available.
@@ -197,6 +169,29 @@ clean() {
 }
 
 
-main
+################################
+# Main command line entry point
+CFG_REQUIREMENTS=$REQUIREMENTS
+
+# 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 ) find_python && clean;;
+                dev   ) CFG_REQUIREMENTS="$DEV_REQUIREMENTS";;
+                init  ) ;;
+            esac;;
+    esac
+done
+
+PIP_EXTRA_ARGS="$PIP_EXTRA_ARGS"
+
+find_python
+create_virtualenv "$VIRTUALENV_DIR"
+install_packages "$CFG_REQUIREMENTS"
+. "$CFG_BIN_DIR/activate"
+
 
 set +e

configure.bat

@@ -77,14 +77,11 @@ if not "%1" == "" (
     if "%1" EQU "--dev"    (
         set "CFG_REQUIREMENTS=%DEV_REQUIREMENTS%"
     )
-    if "%1" EQU "--init"   (
-        set "NO_INDEX= "
-    )
     shift
     goto again
 )
 
-set "PIP_EXTRA_ARGS=%PIP_EXTRA_ARGS% %NO_INDEX%"
+set "PIP_EXTRA_ARGS=%PIP_EXTRA_ARGS%"
 
 
 @rem ################################