diff --git a/resources/constants.py b/resources/constants.py index 11c3ffdd9..7b502dae3 100644 --- a/resources/constants.py +++ b/resources/constants.py @@ -560,10 +560,6 @@ class Constants: @property def gui_path(self): return self.payload_path / Path("Icon/Resources.zip") - - @property - def postinstall_script_path(self): - return self.payload_path / Path("InstallPackage/postinstall") @property def installer_pkg_path(self): diff --git a/resources/sys_patch.py b/resources/sys_patch.py index 85d2f7909..7a767b2b9 100644 --- a/resources/sys_patch.py +++ b/resources/sys_patch.py @@ -286,13 +286,8 @@ class PatchSysVolume: input("\nPress [ENTER] to continue") def unmount_drive(self): - # When we detect we're chainloaded in the Installer, skip unmounting - # We have logging in place to pull additional info after we're done - if not "Library/InstallerSandboxes/" in str(self.constants.payload_path): - print("- Unmounting Root Volume (Don't worry if this fails)") - utilities.elevated(["diskutil", "unmount", self.root_mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode() - else: - print("- Skipping snapshot unmount due to Installer environment") + print("- Unmounting Root Volume (Don't worry if this fails)") + utilities.elevated(["diskutil", "unmount", self.root_mount_path], stdout=subprocess.PIPE).stdout.decode().strip().encode() def delete_old_binaries(self, vendor_patch): for delete_current_kext in vendor_patch: @@ -730,7 +725,7 @@ class PatchSysVolume: return output def download_files(self): - if self.constants.gui_mode is False or (self.constants.wxpython_variant is True and "Library/InstallerSandboxes/" in str(self.constants.payload_path)): + if self.constants.gui_mode is False or "Library/InstallerSandboxes/" in str(self.constants.payload_path): download_result, os_ver, link = sys_patch_download.grab_patcher_support_pkg(self.constants).download_files() else: download_result = True