Skip to content

correct the default launcher case that was no more working #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Feb 14, 2021
Merged

correct the default launcher case that was no more working #933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,13 +1327,27 @@ def _create_batch_scripts_initial(self):
call "%~dp0env.bat"
set WINPYWORKDIR=%~dp0..\Notebooks

set WINPYWORKDIR1=%~dp1
if "%WINPYWORKDIR1:~-1%"=="\" set WINPYWORKDIR1=%WINPYWORKDIR1:~0,-1%

if "%WINPYWORKDIR1%"=="" (
if not "%CD%\"=="%~dp0" set WINPYWORKDIR1=%CD%
rem default is as before: Winpython ..\Notebooks
set WINPYWORKDIR1=%WINPYWORKDIR%

rem if we have a file or directory in %1 parameter, we use that directory
if not "%~1"=="" (
if exist "%~1" (
if exist "%~1\" (
rem echo it is a directory %~1
set WINPYWORKDIR1=%~1
) else (
rem echo it is a file %~1, so we take the directory %~dp1
set WINPYWORKDIR1=%~dp1
)
)
) else (
rem if it it launched from another directory , we keep it that one echo %CD%
if not "%CD%\"=="%~dp0" set WINPYWORKDIR1=%CD%
)
if "%WINPYWORKDIR1%"=="" set WINPYWORKDIR1=%WINPYWORKDIR%

rem remove some potential last \
if "%WINPYWORKDIR1:~-1%"=="\" set WINPYWORKDIR1=%WINPYWORKDIR1:~0,-1%

FOR /F "delims=" %%i IN ('cscript /nologo "%~dp0WinpythonIni.vbs"') DO set winpythontoexec=%%i
%winpythontoexec%set winpythontoexec=
Expand Down Expand Up @@ -1559,6 +1573,7 @@ def _create_batch_scripts(self):
'cmd.bat',
r"""@echo off
call "%~dp0env_for_icons.bat" %*
if not "%WINPYWORKDIR%"=="%WINPYWORKDIR1%" cd %WINPYWORKDIR1%
cmd.exe /k""",
)

Expand All @@ -1567,6 +1582,7 @@ def _create_batch_scripts(self):
r"""@echo off
call "%~dp0env_for_icons.bat" %*
rem backward compatibility for python command-line users
if not "%WINPYWORKDIR%"=="%WINPYWORKDIR1%" cd %WINPYWORKDIR1%
"%WINPYDIR%\python.exe" %*
""",
)
Expand Down