Merge pull request #1503 from stonebig/master

stonebig · web-flow · commit 02d5f867e33e · 2025-03-13T20:26:38.000+01:00
remove useless complexity: "working_directory" program generator
diff --git a/make.py b/make.py
@@ -31,12 +31,6 @@
 def find_7zip_executable() -> str:
     """
     Locates the 7-Zip executable (7z.exe) in common installation directories.
-
-    Raises:
-        RuntimeError: If 7-Zip executable is not found.
-
-    Returns:
-        str: Path to the 7-Zip executable.
     """
     program_files_dirs = [
         Path(r"C:\Program Files"),
@@ -116,11 +110,6 @@ def build_installer_7zip(
 def _copy_items(source_dirs: list[Path], target_dir: Path, verbose: bool = False):
     """
     Copies items from source directories to the target directory.
-
-    Args:
-        source_dirs: List of source directories to copy items from.
-        target_dir: Target directory to copy items to.
-        verbose: Enable verbose output.
     """
     target_dir.mkdir(parents=True, exist_ok=True)
     for source_dir in source_dirs:
@@ -538,19 +527,6 @@ def _create_standard_batch_scripts(self):
         if self.distribution and (Path(self.distribution.target) / r"lib-python\3\idlelib").is_dir():
             batch_replacements.append((r"\Lib\idlelib", r"\lib-python\3\idlelib"))
 
-        for ini_patch_script in [
-            ("make_working_directory_be_not_winpython.bat", "[active_environment", "[inactive_environment", "[inactive_environment_per_user]", "[active_environment_per_user]"),
-            ("make_working_directory_be_winpython.bat", "[active_environment", "[inactive_environment"),
-            ("make_working_directory_and_userprofile_be_winpython.bat", "[active_environment", "[inactive_environment", "[inactive_environment_common]", "[active_environment_common]")
-            ]:
-            name, patch1_start, patch1_end, *patch2 = ini_patch_script
-            content = f"""call "%~dp0env_for_icons.bat"
-"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\\settings\winpython.ini', '{patch1_start}', '{patch1_end}' )"
-"""
-            if patch2:
-                content += f""""%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\\settings\winpython.ini', '{patch2[0]}', '{patch2[1]}' )" """
-            self.create_batch_script(name, content)
-
         self._print_action_done()
 
 
diff --git a/portable/scripts/make_working_directory_and_userprofile_be_winpython.bat b/portable/scripts/make_working_directory_and_userprofile_be_winpython.bat
@@ -0,0 +1,3 @@
+call "%~dp0env_for_icons.bat"
+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"
+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[inactive_environment_common]', '[active_environment_common]' )" 
diff --git a/portable/scripts/make_working_directory_be_not_winpython.bat b/portable/scripts/make_working_directory_be_not_winpython.bat
@@ -0,0 +1,3 @@
+call "%~dp0env_for_icons.bat"
+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"
+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[inactive_environment_per_user]', '[active_environment_per_user]' )" 
diff --git a/portable/scripts/make_working_directory_be_winpython.bat b/portable/scripts/make_working_directory_be_winpython.bat
@@ -0,0 +1,2 @@
+call "%~dp0env_for_icons.bat"
+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+call "%~dp0env_for_icons.bat"`
	`2`	`+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"`
	`3`	`+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[inactive_environment_common]', '[active_environment_common]' )"`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+call "%~dp0env_for_icons.bat"`
	`2`	`+"%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\settings\winpython.ini', '[active_environment', '[inactive_environment' )"`