Skip to content

Commit 3c2cd29

Browse files
stonebigstonebig
authored
Merge pull request winpython#777 from nuno-andre/patch-1
Fix path quoting and clarify redirection syntax
2 parents 69032b0 + 3dab98b commit 3c2cd29

File tree

1 file changed

+54
-44
lines changed

1 file changed

+54
-44
lines changed

‎make.py‎

Lines changed: 54 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,10 +1047,11 @@ def _create_batch_scripts_initial(self):
10471047
set tmp_pyz=%WINPYDIR%\Lib\site-packages\PySide2
10481048
if not exist "%tmp_pyz%" goto pyside2_conf_exist
10491049
set tmp_pyz=%tmp_pyz%\qt.conf
1050-
if exist "%tmp_pyz%" goto pyside2_conf_exist
1051-
echo [Paths]>>"%tmp_pyz%"
1052-
echo Prefix = .>>"%tmp_pyz%"
1053-
echo Binaries = .>>"%tmp_pyz%"
1050+
if not exist "%tmp_pyz%" (
1051+
echo [Paths]
1052+
echo Prefix = .
1053+
echo Binaries = .
1054+
)>> "%tmp_pyz%"
10541055
:pyside2_conf_exist
10551056
10561057
rem ******************
@@ -1059,10 +1060,11 @@ def _create_batch_scripts_initial(self):
10591060
set tmp_pyz=%WINPYDIR%\Lib\site-packages\PyQt5
10601061
if not exist "%tmp_pyz%" goto pyqt5_conf_exist
10611062
set tmp_pyz=%tmp_pyz%\qt.conf
1062-
if exist "%tmp_pyz%" goto pyqt5_conf_exist
1063-
echo [Paths]>>"%tmp_pyz%"
1064-
echo Prefix = .>>"%tmp_pyz%"
1065-
echo Binaries = .>>"%tmp_pyz%"
1063+
if not exist "%tmp_pyz%" (
1064+
echo [Paths]
1065+
echo Prefix = .
1066+
echo Binaries = .
1067+
)>> "%tmp_pyz%"
10661068
:pyqt5_conf_exist
10671069
10681070
@@ -1072,12 +1074,14 @@ def _create_batch_scripts_initial(self):
10721074
if not exist "%HOME%\.pyzo" mkdir %HOME%\.pyzo
10731075
if exist "%HOME%\.pyzo\config.ssdf" goto after_pyzo_conf
10741076
set tmp_pyz="%HOME%\.pyzo\config.ssdf"
1075-
echo shellConfigs2 = list:>>%tmp_pyz%
1076-
echo dict:>>%tmp_pyz%
1077-
echo name = 'Python'>>%tmp_pyz%
1078-
echo exe = '.\\python.exe'>>%tmp_pyz%
1079-
echo ipython = 'no'>>%tmp_pyz%
1080-
echo gui = 'none'>>%tmp_pyz%
1077+
(
1078+
echo shellConfigs2 = list:
1079+
echo dict:
1080+
echo name = 'Python'
1081+
echo exe = '.\\python.exe'
1082+
echo ipython = 'no'
1083+
echo gui = 'none'
1084+
)>> "%tmp_pyz%"
10811085
10821086
:after_pyzo_conf
10831087
@@ -1088,14 +1092,14 @@ def _create_batch_scripts_initial(self):
10881092
if not exist "%WINPYDIRBASE%\settings" mkdir "%WINPYDIRBASE%\settings"
10891093
set winpython_ini=%WINPYDIRBASE%\settings\winpython.ini
10901094
if not exist "%winpython_ini%" (
1091-
echo [debug]>>"%winpython_ini%"
1092-
echo state = disabled>>"%winpython_ini%"
1093-
echo [environment]>>"%winpython_ini%"
1094-
echo ## <?> Uncomment lines to override environment variables>>"%winpython_ini%"
1095-
echo #HOME = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%>>"%winpython_ini%"
1096-
echo #JUPYTER_DATA_DIR = %%HOME%%>>"%winpython_ini%"
1097-
echo #WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks>>"%winpython_ini%"
1098-
)
1095+
echo [debug]
1096+
echo state = disabled
1097+
echo [environment]
1098+
echo ## <?> Uncomment lines to override environment variables
1099+
echo #HOME = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%
1100+
echo #JUPYTER_DATA_DIR = %%HOME%%
1101+
echo #WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks
1102+
)>> "%winpython_ini%"
10991103
11001104
""",
11011105
)
@@ -1394,14 +1398,16 @@ def _create_batch_scripts(self):
13941398
set pydistutils_cfg=%WINPYDIRBASE%\settings\pydistutils.cfg
13951399
13961400
set tmp_blank=
1397-
echo [config]>"%pydistutils_cfg%"
1398-
echo compiler=mingw32>>"%pydistutils_cfg%"
1399-
1400-
echo [build]>>"%pydistutils_cfg%"
1401-
echo compiler=mingw32>>"%pydistutils_cfg%"
1402-
1403-
echo [build_ext]>>"%pydistutils_cfg%"
1404-
echo compiler=mingw32>>"%pydistutils_cfg%"
1401+
(
1402+
echo [config]
1403+
echo compiler=mingw32
1404+
echo.
1405+
echo [build]
1406+
echo compiler=mingw32
1407+
echo.
1408+
echo [build_ext]
1409+
echo compiler=mingw32
1410+
) > "%pydistutils_cfg%"
14051411
14061412
echo cython has been set to use mingw32
14071413
echo to remove this, remove file "%pydistutils_cfg%"
@@ -1446,27 +1452,31 @@ def _create_batch_scripts(self):
14461452
'make_working_directory_be_not_winpython.bat',
14471453
r"""@echo off
14481454
set winpython_ini=%~dp0..\\settings\winpython.ini
1449-
echo [debug]>"%winpython_ini%"
1450-
echo state = disabled>>"%winpython_ini%"
1451-
echo [environment]>>"%winpython_ini%"
1452-
echo ## <?> Uncomment lines to override environment variables>>"%winpython_ini%"
1453-
echo HOME = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\settings>>"%winpython_ini%"
1454-
echo JUPYTER_DATA_DIR = %%HOME%%>>"%winpython_ini%"
1455-
echo WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks>>"%winpython_ini%"
1455+
(
1456+
echo [debug]
1457+
echo state = disabled
1458+
echo [environment]
1459+
echo ## <?> Uncomment lines to override environment variables
1460+
echo HOME = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\settings
1461+
echo JUPYTER_DATA_DIR = %%HOME%%
1462+
echo WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks
1463+
) > "%winpython_ini%"
14561464
""",
14571465
)
14581466

14591467
self.create_batch_script(
14601468
'make_working_directory_be_winpython.bat',
14611469
r"""@echo off
14621470
set winpython_ini=%~dp0..\\settings\winpython.ini
1463-
echo [debug]>"%winpython_ini%"
1464-
echo state = disabled>>"%winpython_ini%"
1465-
echo [environment]>>"%winpython_ini%"
1466-
echo ## <?> Uncomment lines to override environment variables>>"%winpython_ini%"
1467-
echo #HOME = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\settings>>"%winpython_ini%"
1468-
echo #JUPYTER_DATA_DIR = %%HOME%%>>"%winpython_ini%"
1469-
echo #WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks>>"%winpython_ini%"
1471+
(
1472+
echo [debug]
1473+
echo state = disabled
1474+
echo [environment]
1475+
echo ## <?> Uncomment lines to override environment variables
1476+
echo #HOME = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\settings
1477+
echo #JUPYTER_DATA_DIR = %%HOME%%
1478+
echo #WINPYWORKDIR = %%HOMEDRIVE%%%%HOMEPATH%%\Documents\WinPython%%WINPYVER%%\Notebooks
1479+
) > "%winpython_ini%"
14701480
""",
14711481
)
14721482

0 commit comments

Comments
 (0)