From 7d0bbf62bffedfc25db862ed5ede8fe8d1cfb831 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Sat, 27 May 2023 10:58:16 -0600 Subject: [PATCH] main.py: Fix payload routing --- CHANGELOG.md | 1 + resources/main.py | 3 --- resources/network_handler.py | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbc933afe..9677574e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - ex. "EFI" and additional FAT32 partitions on a single drive - Backend changes: - Call `setpgrp()` to prevent app from being killed if parent process is killed (ie. LaunchAgents) + - Resolve payloads path being mis-routed during CLI calls ## 0.6.6 - Implement option to disable ColorSync downgrade on HD 3000 Macs diff --git a/resources/main.py b/resources/main.py index f231dac1f..3041533bc 100644 --- a/resources/main.py +++ b/resources/main.py @@ -107,9 +107,6 @@ class OpenCoreLegacyPatcher: ignore_args = ["--auto_patch", "--gui_patch", "--gui_unpatch", "--update_installed"] if not any(x in sys.argv for x in ignore_args): self.constants.current_path = Path.cwd() - if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"): - logging.info("- Rerouting payloads location") - self.constants.payload_path = sys._MEIPASS / Path("payloads") ignore_args = ignore_args.pop(0) if not any(x in sys.argv for x in ignore_args): diff --git a/resources/network_handler.py b/resources/network_handler.py index 5efd0be14..2dc61fd6f 100644 --- a/resources/network_handler.py +++ b/resources/network_handler.py @@ -316,6 +316,7 @@ class DownloadObject: logging.error(f"- Error preparing working directory {path}: {self.error_msg}") return False + logging.info(f"- Directory ready: {path}") return True