cleaner logic in env_for_icons.bat

stonebig · stonebig · commit cda166173bea · 2025-01-19T12:55:33.000+01:00
diff --git a/make.py b/make.py
@@ -473,8 +473,8 @@ def _create_batch_scripts_initial(self):
             "env.bat",
             r"""@echo off
 set WINPYDIRBASE=%~dp0..
-rem set PYTHONUTF8=1 would create issues in "movable" patching
-rem get a normalize path
+
+rem get a normalized path
 set WINPYDIRBASETMP=%~dp0..
 pushd %WINPYDIRBASETMP%
 set WINPYDIRBASE=%__CD__%
@@ -492,14 +492,16 @@ def _create_batch_scripts_initial(self):
 set WINPYVER="""
             + self.winpyver
             + r"""
-rem 2023-02-12 try utf-8 on console
+
+rem 2023-02-12 utf-8 on console to avoid pip crash
 rem see https://github.com/pypa/pip/issues/11798#issuecomment-1427069681
 set PYTHONIOENCODING=utf-8
+rem set PYTHONUTF8=1 creates issues in "movable" patching
+
 
 set HOME=%WINPYDIRBASE%\settings
-rem read https://github.com/winpython/winpython/issues/839
+rem see https://github.com/winpython/winpython/issues/839
 rem set USERPROFILE=%HOME%
-rem set WINPYDIRBASE=
 set JUPYTER_DATA_DIR=%HOME%
 set JUPYTER_CONFIG_DIR=%WINPYDIR%\etc\jupyter
 set JUPYTER_CONFIG_PATH=%WINPYDIR%\etc\jupyter
@@ -637,24 +639,20 @@ def _create_batch_scripts_initial(self):
 rem remove some potential last \
 if "%WINPYWORKDIR1:~-1%"=="\" set WINPYWORKDIR1=%WINPYWORKDIR1:~0,-1%
 
+rem you can use winpython.ini to change defaults
 FOR /F "delims=" %%i IN ('""%WINPYDIR%\python.exe" "%~dp0WinpythonIni.py""') DO set winpythontoexec=%%i
-
 %winpythontoexec%set winpythontoexec=
 
-rem 2025-01-18: we go directory WINPYWORKDIR1 if we are on icon or script directory
-rem nota: WINPYWORKDRI1 can have be overwriten per winpython.ini
 
-rem old NSIS launcher is  by default at icon\scripts level
-if  "%__CD__%scripts\"=="%~dp0"  cd/D %WINPYWORKDIR1%
-rem new shimmy launcher is by default at icon level
-if  "%__CD__%"=="%~dp0" cd/D %WINPYWORKDIR1%
+rem Preventive Working Directories creation if needed
+if not "%WINPYWORKDIR%"=="" if not exist "%WINPYWORKDIR%" mkdir "%WINPYWORKDIR%"
+if not "%WINPYWORKDIR1%"=="" if not exist "%WINPYWORKDIR1%" mkdir "%WINPYWORKDIR1%"
 
 
-rem ******************
-rem missing student directory part
-rem ******************
+rem Change of directory only if we are in a launcher directory
+if  "%__CD__%scripts\"=="%~dp0"  cd/D %WINPYWORKDIR1%
+if  "%__CD__%"=="%~dp0"          cd/D %WINPYWORKDIR1%
 
-if not exist "%WINPYWORKDIR%" mkdir "%WINPYWORKDIR%"
 
 if not exist "%HOME%\.spyder-py%WINPYVER:~0,1%"  mkdir "%HOME%\.spyder-py%WINPYVER:~0,1%"
 if not exist "%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir" echo %HOME%\Notebooks>"%HOME%\.spyder-py%WINPYVER:~0,1%\workingdir"
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '11.3.20250104'
+__version__ = '11.4.20250119'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
