move pieces of initialisation from env.bat to winpython.ini

stonebig · stonebig · commit 1811311dc293 · 2025-08-10T23:35:52.000+02:00
diff --git a/winpython/portable/launchers_final/scripts/WinPythonIni.py b/winpython/portable/launchers_final/scripts/WinPythonIni.py
@@ -7,6 +7,15 @@
 winpython_inidefault=r'''
 [debug]
 state = disabled
+[env.bat]
+#PYTHONPATHz = %WINPYDIR%;%WINPYDIR%\Lib;%WINPYDIR%\DLLs
+#see https://github.com/winpython/winpython/issues/839
+#USERPROFILE = %HOME%
+#PYTHONUTF8=1 creates issues in "movable" patching
+SPYDER_CONFDIR = %HOME%\settings\.spyder-py3
+JUPYTER_DATA_DIR = %HOME%
+JUPYTER_CONFIG_DIR = %WINPYDIR%\etc\jupyter
+JUPYTER_CONFIG_PATH = %WINPYDIR%\etc\jupyter
 [inactive_environment_per_user]
 ## <?> changing this segment to [active_environment_per_user] makes this segment of lines active or not
 HOME = %HOMEDRIVE%%HOMEPATH%\Documents\WinPython%WINPYVER%\settings
@@ -39,7 +48,7 @@ def get_file(file_name):
         with open(file_name, 'r') as file:
            return file.read()
     except FileNotFoundError:
-        if file_name[-3:] == 'ini':
+        if file_name.endswith("winpython.ini"):
             os.makedirs(Path(file_name).parent, exist_ok=True)
             with open(file_name, 'w') as file:
                 file.write(winpython_inidefault)
@@ -77,19 +86,20 @@ def main():
             if not (p / 'qt.conf').is_file():
                 with open(p / 'qt.conf', 'w') as file:
                     file.write(qt_conf)
-
+    prefix , postfix = "set ", "&& "
+    #prefix , postfix = "set ", "\n"
     for l in my_lines:
         if l.startswith("["):
             segment = l[1:].split("]")[0]
         elif not l.startswith("#") and "=" in l:
             data = l.split("=", 1)
             if segment == "debug" and data[0].strip() == "state":
                 data[0] = "WINPYDEBUG"
-            if segment in ["environment", "debug", "active_environment_per_user", "active_environment_common"]:
-                txt += f"set {data[0].strip()}={translate(data[1].strip(), env)}&& "
+            if segment in ["env.bat", "environment", "debug", "active_environment_per_user", "active_environment_common"]:
+                txt += f"{prefix}{data[0].strip()}={translate(data[1].strip(), env)}{postfix}"
                 env[data[0].strip()] = translate(data[1].strip(), env)
             if segment == "debug" and data[0].strip() == "state":
-                txt += f"set WINPYDEBUG={data[1].strip()}&&"
+                txt += f"{prefix}WINPYDEBUG={data[1].strip()}{postfix}"
 
     print(txt)
 
diff --git a/winpython/portable/launchers_final/scripts/env.bat b/winpython/portable/launchers_final/scripts/env.bat
@@ -16,29 +16,19 @@ if "%WINPYDIRBASE:~-1%"=="\" set WINPYDIRBASE=%WINPYDIRBASE:~0,-1%
 set WINPYDIRBASETMP=
 popd
 
-set WINPYDIR=%WINPYDIRBASE%\%WINpython_subdirectory_name%
+set WINPYDIR=%WINPYDIRBASE%\%WINPYthon_subdirectory_name%
 rem 2019-08-25 pyjulia needs absolutely a variable PYTHON=%WINPYDIR%\python.exe
 set PYTHON=%WINPYDIR%\%WINpython_exe%
-set PYTHONPATHz=%WINPYDIR%;%WINPYDIR%\Lib;%WINPYDIR%\DLLs
-set WINPYVER=%WINPYVER%
 
 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 see https://github.com/winpython/winpython/issues/839
-rem set USERPROFILE=%HOME%
-set SPYDER_CONFDIR=%HOME%\settings\.spyder-py3
-set JUPYTER_DATA_DIR=%HOME%
-set JUPYTER_CONFIG_DIR=%WINPYDIR%\etc\jupyter
-set JUPYTER_CONFIG_PATH=%WINPYDIR%\etc\jupyter
-set FINDDIR=%WINDIR%\system32
 
 rem Remove all double quotes
 set PATH_CLEANED=%PATH:"=%
-echo ";%PATH_CLEANED%;" | %FINDDIR%\find.exe /C /I ";%WINPYDIR%\;" >nul
+echo ";%PATH_CLEANED%;" | %WINDIR%\system32\find.exe /C /I ";%WINPYDIR%\;" >nul
 if %ERRORLEVEL% NEQ 0 (
    set "PATH=%WINPYDIR%\Lib\site-packages\PyQt5;%WINPYDIR%\;%WINPYDIR%\DLLs;%WINPYDIR%\Scripts;%WINPYDIR%\..\t;%WINPYDIR%\..\n;%PATH%"
    cd .
