#Fixed 489 - configure is now working path with spaces

 * Normalize quotation marks
 * Add quotation at proper location to have it works on path contains
spaces

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

Diff for: about.bat

@@ -11,7 +11,7 @@ cd %ABOUT_ROOT_DIR%
 set VIRTUALENV_DIR=venv
 
 set CMD_LINE_ARGS= 
-set CONFIGURED_PYTHON=%ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts\python.exe
+set CONFIGURED_PYTHON="%ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts\python.exe"
 
 @rem Collect all command line arguments in a variable
 :collectarg
@@ -28,11 +28,11 @@ goto about
 
 :configure
  echo * Configuring AboutCode ...
- call %ABOUT_ROOT_DIR%\configure
+ call "%ABOUT_ROOT_DIR%\configure"
 
 :about
-call %ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts\activate
-echo %ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\bin\about %CMD_LINE_ARGS%
-%ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\bin\about %CMD_LINE_ARGS%
+call "%ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts\activate"
+echo "%ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\bin\about" %CMD_LINE_ARGS%
+"%ABOUT_ROOT_DIR%\%VIRTUALENV_DIR%\bin\about" %CMD_LINE_ARGS%
 
 :EOS

Diff for: configure.bat

@@ -46,13 +46,11 @@ set VIRTUALENV_PYZ_URL=https://bootstrap.pypa.io/virtualenv.pyz
 set CFG_ROOT_DIR=%~dp0
 set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
 
-
 @rem ################################
 @rem # Thirdparty package locations and index handling
-set "PIP_EXTRA_ARGS=--find-links %CFG_ROOT_DIR%\thirdparty --find-links https://thirdparty.aboutcode.org/pypi" & %INDEX_ARG%
+set "PIP_EXTRA_ARGS=--find-links "%CFG_ROOT_DIR%\thirdparty" --find-links https://thirdparty.aboutcode.org/pypi" & %INDEX_ARG%
 @rem ################################
 
-
 @rem ################################
 @rem # Set the quiet flag to empty if not defined
 if not defined CFG_QUIET (
@@ -83,15 +81,14 @@ if not "%1" == "" (
 
 set "PIP_EXTRA_ARGS=%PIP_EXTRA_ARGS% %NO_INDEX%"
 
-
 @rem ################################
 @rem # find a proper Python to run
 @rem # Use environment variables or a file if available.
 @rem # Otherwise the latest Python by default.
 if not defined PYTHON_EXECUTABLE (
     @rem # check for a file named PYTHON_EXECUTABLE
-    if exist ""%CFG_ROOT_DIR%\PYTHON_EXECUTABLE"" (
-        set /p PYTHON_EXECUTABLE=<""%CFG_ROOT_DIR%\PYTHON_EXECUTABLE""
+    if exist "%CFG_ROOT_DIR%\PYTHON_EXECUTABLE" (
+        set /p PYTHON_EXECUTABLE=<"%CFG_ROOT_DIR%\PYTHON_EXECUTABLE"
     ) else (
         set "PYTHON_EXECUTABLE=py"
     )
@@ -103,22 +100,22 @@ if not defined PYTHON_EXECUTABLE (
 @rem # presence is not consistent across Linux distro and sometimes pip is not
 @rem # included either by default. The virtualenv.pyz app cures all these issues.
 
-if not exist ""%CFG_BIN_DIR%\python.exe"" (
+if not exist "%CFG_BIN_DIR%\python.exe" (
     if not exist "%CFG_BIN_DIR%" (
-        mkdir %CFG_BIN_DIR%
+        mkdir "%CFG_BIN_DIR%"
     )
 
-    if exist ""%CFG_ROOT_DIR%\etc\thirdparty\virtualenv.pyz"" (
+    if exist "%CFG_ROOT_DIR%\etc\thirdparty\virtualenv.pyz" (
         %PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%\etc\thirdparty\virtualenv.pyz" ^
             --wheel embed --pip embed --setuptools embed ^
             --seeder pip ^
             --never-download ^
             --no-periodic-update ^
             --no-vcs-ignore ^
             %CFG_QUIET% ^
-            %CFG_ROOT_DIR%\%VIRTUALENV_DIR%
+            "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%"
     ) else (
-        if not exist ""%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\virtualenv.pyz"" (
+        if not exist "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\virtualenv.pyz" (
             curl -o "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\virtualenv.pyz" %VIRTUALENV_PYZ_URL%
 
             if %ERRORLEVEL% neq 0 (
@@ -132,10 +129,11 @@ if not exist ""%CFG_BIN_DIR%\python.exe"" (
             --no-periodic-update ^
             --no-vcs-ignore ^
             %CFG_QUIET% ^
-            %CFG_ROOT_DIR%\%VIRTUALENV_DIR%
+            "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%"
     )
 )
 
+
 if %ERRORLEVEL% neq 0 (
     exit /b %ERRORLEVEL%
 )
@@ -148,7 +146,7 @@ if %ERRORLEVEL% neq 0 (
 @rem # speeds up the installation.
 @rem # We always have the PEP517 build dependencies installed already.
 
-%CFG_BIN_DIR%\pip install ^
+"%CFG_BIN_DIR%\pip" install ^
     --upgrade ^
     --no-build-isolation ^
     %CFG_QUIET% ^
@@ -159,7 +157,7 @@ if %ERRORLEVEL% neq 0 (
 if exist "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" (
     rmdir /s /q "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin"
 )
-mklink /J %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin %CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts
+mklink /J "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\bin" "%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
 
 if %ERRORLEVEL% neq 0 (
     exit /b %ERRORLEVEL%