From a2e0270f99ba5a635f7100483691dd7eb974f461 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 25 May 2022 12:20:22 -0600 Subject: [PATCH] Build-Command: Strip additional binaries during build --- Build-Binary.command | 13 +++++++++++++ gui/gui_main.py | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Build-Binary.command b/Build-Binary.command index af8ddb1a7..0e64fc00a 100755 --- a/Build-Binary.command +++ b/Build-Binary.command @@ -62,6 +62,7 @@ class create_binary: def preflight_processes(self): print("- Starting preflight processes") self.setup_pathing() + self.delete_extra_binaries() self.download_resources() if not self.args.build_tui: # payloads.dmg is only needed for GUI builds @@ -100,6 +101,17 @@ class create_binary: print(build_result.stderr.decode('utf-8')) raise Exception("Build failed") + def delete_extra_binaries(self): + delete_files = [ + "AutoPkg-Assets.pkg", + "AutoPkg-Assets.pkg.zip", + "InstallAssistant.pkg", + ] + print("- Deleting extra binaries...") + for file in Path("payloads").glob(pattern="*"): + if file.name in delete_files: + print(f" - Deleting {file.name}") + file.unlink() def download_resources(self): patcher_support_pkg_version = constants.Constants().patcher_support_pkg_version @@ -107,6 +119,7 @@ class create_binary: "Universal-Binaries.zip" ] + print("- Downloading required resources...") for resource in required_resources: if Path(f"./payloads/{resource}").exists(): if self.args.reset_binaries: diff --git a/gui/gui_main.py b/gui/gui_main.py index c5950b9bf..ea74fe70e 100644 --- a/gui/gui_main.py +++ b/gui/gui_main.py @@ -1631,7 +1631,7 @@ class wx_python_gui: print("Installer found") for app in available_installers: print(f"{available_installers[app]['Short Name']}: {available_installers[app]['Version']} ({available_installers[app]['Build']})") - self.install_selection = wx.Button(self.frame, label=f"{available_installers[app]['Short Name']}: {available_installers[app]['Version']} ({available_installers[app]['Build']})", size=(300, 30)) + self.install_selection = wx.Button(self.frame, label=f"{available_installers[app]['Short Name']}: {available_installers[app]['Version']} ({available_installers[app]['Build']})", size=(320, 30)) i = i + 25 self.install_selection.SetPosition( wx.Point(