Merge pull request winpython#932 from stonebig/master

stonebig · web-flow · commit b11e380d4afc · 2021-02-14T10:28:49.000+01:00
bug fixing so spyder launches as expected
diff --git a/make.py b/make.py
@@ -1328,6 +1328,8 @@ def _create_batch_scripts_initial(self):
 set WINPYWORKDIR=%~dp0..\Notebooks
 
 set WINPYWORKDIR1=%~dp1
+if "%WINPYWORKDIR1:~-1%"=="\" set WINPYWORKDIR1=%WINPYWORKDIR1:~0,-1%
+
 if "%WINPYWORKDIR1%"=="" (
    if not "%CD%\"=="%~dp0" set  WINPYWORKDIR1=%CD%
 )
@@ -1648,6 +1650,7 @@ def _create_batch_scripts(self):
    "%WINPYDIR%\scripts\spyder3.exe" %* -w "%WINPYWORKDIR1%"
 ) else (
    "%WINPYDIR%\scripts\spyder.exe" %* -w "%WINPYWORKDIR1%"
+)  
 """,
         )
 

Original file line number	Diff line number	Diff line change
`@@ -1328,6 +1328,8 @@ def _create_batch_scripts_initial(self):`
`1328`	`1328`	`set WINPYWORKDIR=%~dp0..\Notebooks`
`1329`	`1329`
`1330`	`1330`	`set WINPYWORKDIR1=%~dp1`
	`1331`	`+if "%WINPYWORKDIR1:~-1%"=="\" set WINPYWORKDIR1=%WINPYWORKDIR1:~0,-1%`
	`1332`	`+`
`1331`	`1333`	`if "%WINPYWORKDIR1%"=="" (`
`1332`	`1334`	`if not "%CD%\"=="%~dp0" set WINPYWORKDIR1=%CD%`
`1333`	`1335`	`)`
`@@ -1648,6 +1650,7 @@ def _create_batch_scripts(self):`
`1648`	`1650`	`"%WINPYDIR%\scripts\spyder3.exe" %* -w "%WINPYWORKDIR1%"`
`1649`	`1651`	`) else (`
`1650`	`1652`	`"%WINPYDIR%\scripts\spyder.exe" %* -w "%WINPYWORKDIR1%"`
	`1653`	`+)`
`1651`	`1654`	`""",`
`1652`	`1655`	`)`
`1653`	`1656`