@@ -473,8 +473,8 @@ def _create_batch_scripts_initial(self):
473473 "env.bat" ,
474474 r"""@echo off
475475set WINPYDIRBASE=%~dp0..
476- rem set PYTHONUTF8=1 would create issues in "movable" patching
477- rem get a normalize path
476+
477+ rem get a normalized path
478478set WINPYDIRBASETMP=%~dp0..
479479pushd %WINPYDIRBASETMP%
480480set WINPYDIRBASE=%__CD__%
@@ -492,14 +492,16 @@ def _create_batch_scripts_initial(self):
492492set WINPYVER="""
493493 + self .winpyver
494494 + r"""
495- rem 2023-02-12 try utf-8 on console
495+
496+ rem 2023-02-12 utf-8 on console to avoid pip crash
496497rem see https://github.com/pypa/pip/issues/11798#issuecomment-1427069681
497498set PYTHONIOENCODING=utf-8
499+ rem set PYTHONUTF8=1 creates issues in "movable" patching
500+
498501
499502set HOME=%WINPYDIRBASE%\settings
500- rem read https://github.com/winpython/winpython/issues/839
503+ rem see https://github.com/winpython/winpython/issues/839
501504rem set USERPROFILE=%HOME%
502- rem set WINPYDIRBASE=
503505set JUPYTER_DATA_DIR=%HOME%
504506set JUPYTER_CONFIG_DIR=%WINPYDIR%\etc\jupyter
505507set JUPYTER_CONFIG_PATH=%WINPYDIR%\etc\jupyter
@@ -637,24 +639,20 @@ def _create_batch_scripts_initial(self):
637639rem remove some potential last \
638640if "%WINPYWORKDIR1:~-1%"=="\" set WINPYWORKDIR1=%WINPYWORKDIR1:~0,-1%
639641
642+ rem you can use winpython.ini to change defaults
640643FOR /F "delims=" %%i IN ('""%WINPYDIR%\python.exe" "%~dp0WinpythonIni.py""') DO set winpythontoexec=%%i
641-
642644%winpythontoexec%set winpythontoexec=
643645
644- rem 2025-01-18: we go directory WINPYWORKDIR1 if we are on icon or script directory
645- rem nota: WINPYWORKDRI1 can have be overwriten per winpython.ini
646646
647- rem old NSIS launcher is by default at icon\scripts level
648- if "%__CD__%scripts\"=="%~dp0" cd/D %WINPYWORKDIR1%
649- rem new shimmy launcher is by default at icon level
650- if "%__CD__%"=="%~dp0" cd/D %WINPYWORKDIR1%
647+ rem Preventive Working Directories creation if needed
648+ if not "%WINPYWORKDIR%"=="" if not exist "%WINPYWORKDIR%" mkdir "%WINPYWORKDIR%"
649+ if not "%WINPYWORKDIR1%"=="" if not exist "%WINPYWORKDIR1%" mkdir "%WINPYWORKDIR1%"
651650
652651
653- rem ******************
654- rem missing student directory part
655- rem ******************
652+ rem Change of directory only if we are in a launcher directory
653+ if "%__CD__%scripts\"=="%~dp0" cd/D %WINPYWORKDIR1%
654+ if "%__CD__%"=="%~dp0" cd/D %WINPYWORKDIR1%
656655
657- if not exist "%WINPYWORKDIR%" mkdir "%WINPYWORKDIR%"
658656
659657if not exist "%HOME%\.spyder-py%WINPYVER:~0,1%" mkdir "%HOME%\.spyder-py%WINPYVER:~0,1%"
660658if not exist "%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir" echo %HOME%\Notebooks>"%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir"
0 commit comments