Initial Commit

resources/sys_patch.py

@@ -10,7 +10,6 @@ import shutil
 import subprocess
 import zipfile
 from pathlib import Path
-import sys
 
 from resources import constants, utilities, generate_smbios, sys_patch_download, sys_patch_detect
 from data import sip_data, sys_patch_data, os_data
@@ -247,7 +246,7 @@ class PatchSysVolume:
         if result.returncode != 0 or (self.constants.detected_os < os_data.os_data.catalina and "KernelCache ID" not in result.stdout.decode()):
             self.success_status = False
             print("- Unable to build new kernel cache")
-            print("\nReason for Patch Failure:")
+            print(f"\nReason for Patch Failure({result.returncode}):")
             print(result.stdout.decode())
             print("")
             print("\nPlease reboot the machine to avoid potential issues rerunning the patcher")
@@ -283,8 +282,13 @@ class PatchSysVolume:
                 input("\nPress [ENTER] to continue")
 
     def unmount_drive(self):
-        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()
+        # 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 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")
 
     def delete_old_binaries(self, vendor_patch):
         for delete_current_kext in vendor_patch:
@@ -306,6 +310,51 @@ class PatchSysVolume:
             utilities.process_status(utilities.elevated(["chmod", "-Rf", "755", f"{self.mount_extensions}/{add_current_kext}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
             utilities.process_status(utilities.elevated(["chown", "-Rf", "root:wheel", f"{self.mount_extensions}/{add_current_kext}"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
         
+    def install_auto_patcher_launch_agent(self):
+        # Installs the following:
+        #   - OpenCore-Patcher.app in /Library/Application Support/Dortania/
+        #   - com.dortania.opencore-legacy-patcher.auto-patch.plist in /Library/LaunchAgents/
+        if self.constants.launcher_script is None:
+            # Verify our binary isn't located in '/Library/Application Support/Dortania/'
+            # As we'd simply be duplicating ourselves
+            if not self.constants.launcher_binary.startswith("/Library/Application Support/Dortania/"):
+                print("- Installing Auto Patcher Launch Agent")
+            
+                if not Path("Library/Application Support/Dortania").exists():
+                    print("- Creating /Library/Application Support/Dortania/")
+                    utilities.process_status(utilities.elevated(["mkdir", "-p", "/Library/Application Support/Dortania"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
+                print("- Copying OpenCore Patcher to /Library/Application Support/Dortania/")
+                if Path("/Library/Application Support/Dortania/OpenCore-Patcher.app").exists():
+                    print("- Deleting existing OpenCore-Patcher")
+                    utilities.process_status(utilities.elevated(["rm", "-R", "/Library/Application Support/Dortania/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
+                # Strip everything after OpenCore-Patcher.app
+                path = self.constants.launcher_binary.split("OpenCore-Patcher.app")[0] + "OpenCore-Patcher.app"
+                print(f"- Copying {path} to /Library/Application Support/Dortania/")
+                utilities.process_status(utilities.elevated(["cp", "-R", path, "/Library/Application Support/Dortania/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            
+            # Copy over our launch agent
+            print("- Copying auto-patch.plist Launch Agent to /Library/LaunchAgents/")
+            if Path("/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist").exists():
+                print("- Deleting existing auto-patch.plist")
+                utilities.process_status(utilities.elevated(["rm", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["cp", self.constants.auto_patch_launch_agent_path, "/Library/LaunchAgents/"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
+            # Set the permissions on the com.dortania.opencore-legacy-patcher.auto-patch.plist
+            print("- Setting permissions on auto-patch.plist")
+            utilities.process_status(utilities.elevated(["chmod", "644", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+            utilities.process_status(utilities.elevated(["chown", "root:wheel", "/Library/LaunchAgents/com.dortania.opencore-legacy-patcher.auto-patch.plist"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+
+            # Making app alias
+            # Simply an easy way for users to notice the app
+            # If there's already an alias or exiting app, skip
+            if not Path("/Applications/OpenCore-Patcher.app").exists():
+                print("- Making app alias")
+                utilities.process_status(utilities.elevated(["ln", "-s", "/Library/Application Support/Dortania/OpenCore-Patcher.app", "/Applications/OpenCore-Patcher.app"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT))
+        else:
+            print("- Skipping Auto Patcher Launch Agent, not supported when running from source")
+
     def clean_skylight_plugins(self):
         if (Path(self.mount_application_support) / Path("SkyLightPlugins/")).exists():
             print("- Found SkylightPlugins folder, removing")
@@ -649,6 +698,9 @@ class PatchSysVolume:
             print("- Installing Legacy Mux Brightness support")
             self.add_legacy_mux_patch()
 
+        if self.constants.wxpython_variant is True and self.constants.detected_os >= os_data.os_data.big_sur: 
+            self.install_auto_patcher_launch_agent()
+
         if self.validate is False:
             self.rebuild_snapshot()
 
@@ -667,7 +719,7 @@ class PatchSysVolume:
         return output
 
     def download_files(self):
-        if self.constants.gui_mode is False:
+        if self.constants.gui_mode is False or (self.constants.wxpython_variant is True and "Library/InstallerSandboxes/" in self.constants.payload_path):
             download_result, os_ver, link = sys_patch_download.grab_patcher_support_pkg(self.constants).download_files()
         else:
             download_result = True