@@ -49,11 +49,11 @@ set "CFG_BIN_DIR=%CFG_ROOT_DIR%\%VIRTUALENV_DIR%\Scripts"
49
49
50
50
@ rem ################################
51
51
@ rem # Thirdparty package locations and index handling
52
- if exist " " %CFG_ROOT_DIR% \thirdparty" " (
53
- set " PIP_EXTRA_ARGS = --find-links %CFG_ROOT_DIR% \thirdparty "
52
+ if exist " %CFG_ROOT_DIR% \thirdparty" (
53
+ set PIP_EXTRA_ARGS = --find-links " %CFG_ROOT_DIR% \thirdparty"
54
54
)
55
55
56
- set " PIP_EXTRA_ARGS = %PIP_EXTRA_ARGS% --find-links https://thirdparty.aboutcode.org/pypi" & %INDEX_ARG%
56
+ set " PIP_EXTRA_ARGS = %PIP_EXTRA_ARGS% " --find-links https://thirdparty.aboutcode.org/pypi & %INDEX_ARG%
57
57
@ rem ################################
58
58
59
59
@@ -67,15 +67,15 @@ if not defined CFG_QUIET (
67
67
@ rem ################################
68
68
@ rem # Main command line entry point
69
69
set CFG_DEV_MODE = 0
70
- set " CFG_REQUIREMENTS = %REQUIREMENTS% "
70
+ set CFG_REQUIREMENTS = %REQUIREMENTS%
71
71
set " NO_INDEX = --no-index"
72
72
73
73
:again
74
74
if not " %1 " == " " (
75
75
if " %1 " EQU " --help" (goto cli_help)
76
76
if " %1 " EQU " --clean" (goto clean)
77
77
if " %1 " EQU " --dev" (
78
- set " CFG_REQUIREMENTS = %DEV_REQUIREMENTS% "
78
+ set CFG_REQUIREMENTS = %DEV_REQUIREMENTS%
79
79
set CFG_DEV_MODE = 1
80
80
)
81
81
if " %1 " EQU " --init" (
@@ -94,8 +94,8 @@ set "PIP_EXTRA_ARGS=%PIP_EXTRA_ARGS% %NO_INDEX%"
94
94
@ rem # Otherwise the latest Python by default.
95
95
if not defined PYTHON_EXECUTABLE (
96
96
@ rem # check for a file named PYTHON_EXECUTABLE
97
- if exist " " %CFG_ROOT_DIR% \PYTHON_EXECUTABLE" " (
98
- set /p PYTHON_EXECUTABLE = < " " %CFG_ROOT_DIR% \PYTHON_EXECUTABLE" "
97
+ if exist " %CFG_ROOT_DIR% \PYTHON_EXECUTABLE" (
98
+ set /p PYTHON_EXECUTABLE = < " %CFG_ROOT_DIR% \PYTHON_EXECUTABLE"
99
99
) else (
100
100
set " PYTHON_EXECUTABLE = py"
101
101
)
@@ -107,22 +107,22 @@ if not defined PYTHON_EXECUTABLE (
107
107
@ rem # presence is not consistent across Linux distro and sometimes pip is not
108
108
@ rem # included either by default. The virtualenv.pyz app cures all these issues.
109
109
110
- if not exist " " %CFG_BIN_DIR% \python.exe" " (
110
+ if not exist " %CFG_BIN_DIR% \python.exe" (
111
111
if not exist " %CFG_BIN_DIR% " (
112
- mkdir %CFG_BIN_DIR%
112
+ mkdir " %CFG_BIN_DIR% "
113
113
)
114
114
115
- if exist " " %CFG_ROOT_DIR% \etc\thirdparty\virtualenv.pyz" " (
115
+ if exist " %CFG_ROOT_DIR% \etc\thirdparty\virtualenv.pyz" (
116
116
%PYTHON_EXECUTABLE% " %CFG_ROOT_DIR% \etc\thirdparty\virtualenv.pyz" ^
117
117
--wheel embed --pip embed --setuptools embed ^
118
118
--seeder pip ^
119
119
--never-download ^
120
120
--no-periodic-update ^
121
121
--no-vcs-ignore ^
122
122
%CFG_QUIET% ^
123
- %CFG_ROOT_DIR% \%VIRTUALENV_DIR%
123
+ " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% "
124
124
) else (
125
- if not exist " " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \virtualenv.pyz" " (
125
+ if not exist " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \virtualenv.pyz" (
126
126
curl -o " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \virtualenv.pyz" %VIRTUALENV_PYZ_URL%
127
127
128
128
if %ERRORLEVEL% neq 0 (
@@ -136,7 +136,7 @@ if not exist ""%CFG_BIN_DIR%\python.exe"" (
136
136
--no-periodic-update ^
137
137
--no-vcs-ignore ^
138
138
%CFG_QUIET% ^
139
- %CFG_ROOT_DIR% \%VIRTUALENV_DIR%
139
+ " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% "
140
140
)
141
141
)
142
142
@@ -152,7 +152,15 @@ if %ERRORLEVEL% neq 0 (
152
152
@ rem # speeds up the installation.
153
153
@ rem # We always have the PEP517 build dependencies installed already.
154
154
155
- %CFG_BIN_DIR% \pip install ^
155
+ echo " %CFG_BIN_DIR% \pip" install ^
156
+ --upgrade ^
157
+ --no-build-isolation ^
158
+ %CFG_QUIET% ^
159
+ %PIP_EXTRA_ARGS% ^
160
+ %CFG_REQUIREMENTS%
161
+
162
+
163
+ " %CFG_BIN_DIR% \pip" install ^
156
164
--upgrade ^
157
165
--no-build-isolation ^
158
166
%CFG_QUIET% ^
@@ -163,7 +171,7 @@ if %ERRORLEVEL% neq 0 (
163
171
if exist " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \bin" (
164
172
rmdir /s /q " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \bin"
165
173
)
166
- mklink /J %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \bin %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \Scripts
174
+ mklink /J " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \bin" " %CFG_ROOT_DIR% \%VIRTUALENV_DIR% \Scripts"
167
175
168
176
if %ERRORLEVEL% neq 0 (
169
177
exit /b %ERRORLEVEL%
0 commit comments