Merge pull request winpython#1042 from stonebig/master

stonebig · web-flow · commit 8fbc9f9173af · 2021-12-04T16:54:31.000+01:00
re-apply patch winpython#1024
diff --git a/make.py b/make.py
@@ -1020,7 +1020,7 @@ def _create_batch_scripts_initial(self):
 rem get a normalize path
 set WINPYDIRBASETMP=%~dp0..
 pushd %WINPYDIRBASETMP%
-set WINPYDIRBASE=%CD%
+set WINPYDIRBASE=%__CD__%
 set WINPYDIRBASETMP=
 popd
 
@@ -1375,8 +1375,8 @@ def _create_batch_scripts_initial(self):
 	  )
    )
 ) else (
-rem if it it launched from another directory , we keep it that one echo %CD%
-if not "%CD%\"=="%~dp0" set  WINPYWORKDIR1="%CD%"
+rem if it it launched from another directory , we keep it that one echo %__CD__%
+if not "%__CD__%\"=="%~dp0" set  WINPYWORKDIR1="%__CD__%"
 )
 
 rem remove some potential last \

Original file line number	Diff line number	Diff line change
`@@ -1020,7 +1020,7 @@ def _create_batch_scripts_initial(self):`
`1020`	`1020`	`rem get a normalize path`
`1021`	`1021`	`set WINPYDIRBASETMP=%~dp0..`
`1022`	`1022`	`pushd %WINPYDIRBASETMP%`
`1023`		`-set WINPYDIRBASE=%CD%`
	`1023`	`+set WINPYDIRBASE=%__CD__%`
`1024`	`1024`	`set WINPYDIRBASETMP=`
`1025`	`1025`	`popd`
`1026`	`1026`
`@@ -1375,8 +1375,8 @@ def _create_batch_scripts_initial(self):`
`1375`	`1375`	`)`
`1376`	`1376`	`)`
`1377`	`1377`	`) else (`
`1378`		`-rem if it it launched from another directory , we keep it that one echo %CD%`
`1379`		`-if not "%CD%\"=="%~dp0" set WINPYWORKDIR1="%CD%"`
	`1378`	`+rem if it it launched from another directory , we keep it that one echo %__CD__%`
	`1379`	`+if not "%__CD__%\"=="%~dp0" set WINPYWORKDIR1="%__CD__%"`
`1380`	`1380`	`)`
`1381`	`1381`
`1382`	`1382`	`rem remove some potential last \`