Add Disk Prompt for autopatcher

gui/gui_main.py

@@ -2,6 +2,7 @@
 # Implemented using wxPython
 # Currently Work in Progress
 
+import plistlib
 import wx
 import sys
 import webbrowser
@@ -367,7 +368,10 @@ class wx_python_gui:
             elif "--gui_unpatch" in sys.argv:
                 self.patches = sys_patch_detect.detect_root_patch(self.computer.real_model, self.constants).detect_patch_set()
                 self.root_patch_revert()
+            elif self.constants.start_build_install is True:
+                self.build_install_menu()
         self.finished_auto_patch = True
+        self.constants.start_build_install = False
 
         if self.app.MainLoop() is None:
             self.app.MainLoop() 
@@ -511,6 +515,9 @@ class wx_python_gui:
         )
         self.return_to_main_menu.Bind(wx.EVT_BUTTON, self.main_menu)
         self.return_to_main_menu.Centre(wx.HORIZONTAL)
+
+        if self.constants.start_build_install is True:
+            self.build_start()
     
     def build_start(self, event=None):
         self.build_opencore.Disable()
@@ -1545,8 +1552,15 @@ class wx_python_gui:
         disk = disk + "s2" # ESP sits at 1, and we know macOS will have created the main partition at 2
         if Path(self.constants.installer_pkg_path).exists():
             path = utilities.grab_mount_point_from_disk(disk)
-            subprocess.run(["mkdir", "-p", f"{path}/Library/Packages/"])
+            if Path(path + "/System/Library/CoreServices/SystemVersion.plist").exists():
-            subprocess.run(["cp", "-r", self.constants.installer_pkg_path, f"{path}/Library/Packages/"])
+                kernel_version = plistlib.load(Path(path + "/System/Library/CoreServices/SystemVersion.plist").open("rb"))
+                kernel_version = kernel_version["ProductBuildVersion"]
+                kernel_version = kernel_version[:2] # Grab first 2 digits, we can assume the lowest installer to be 10.9 (XNU 13)
+                if int(kernel_version) >= os_data.os_data.big_sur:
+                    subprocess.run(["mkdir", "-p", f"{path}/Library/Packages/"])
+                    subprocess.run(["cp", "-r", self.constants.installer_pkg_path, f"{path}/Library/Packages/"])
+                else:
+                    print("- Installer unsupported, requires Big Sur or newer")
 
     def settings_menu(self, event=None):
         # Define Menu

resources/constants.py

@@ -193,10 +193,9 @@ class Constants:
         self.disable_xcpm = False  #           Disable XCPM (X86PlatformPlugin.kext)
         self.root_patcher_succeded = False  #  Determine if root patcher succeeded
         self.booted_oc_disk = None  #          Determine current disk OCLP booted from
+        self.start_build_install = False  #    Determine if build install should be started
 
         self.legacy_accel_support = [
-            os_data.os_data.mojave,
-            os_data.os_data.catalina,
             os_data.os_data.big_sur,
             os_data.os_data.monterey,
         ]

resources/sys_patch_auto.py

@@ -8,9 +8,11 @@
 # If all these tests pass, start Root Patcher
 # Copyright (C) 2022, Mykola Grymalyuk
 
+import plistlib
 import subprocess
 import webbrowser
 from resources import sys_patch_detect, utilities, sys_patch_detect, updates
+from gui import gui_main
 
 class AutomaticSysPatch:
     def start_auto_patch(settings):
@@ -68,32 +70,92 @@ class AutomaticSysPatch:
                                     stderr=subprocess.STDOUT
                                 )
                         else:
-                            for entry in dict:
+                            version = dict[0]["Version"]
-                                version = dict[entry]["Version"]
+                            github_link = dict[0]["Github Link"]
-                                github_link = dict[entry]["Github Link"]
+                            print(f"- Found new version: {version}")
-                                print(f"- Found new version: {version}")
 
-                                # launch oascript to ask user if they want to apply the update
+                            # launch oascript to ask user if they want to apply the update
-                                # if yes, open the link in the default browser
+                            # if yes, open the link in the default browser
-                                # we never want to run the root patcher if there are updates available
+                            # we never want to run the root patcher if there are updates available
-                                args = [
+                            args = [
-                                    "osascript",
+                                "osascript",
-                                    "-e",
+                                "-e",
-                                    f"""display dialog "OpenCore Legacy Patcher has detected you're running without Root Patches, and would like to install them.\n\nHowever we've detected a new version of OCLP on Github. Would you like to view this?\n\nCurrent Version: {settings.patcher_version}\nRemote Version: {version}" """
+                                f"""display dialog "OpenCore Legacy Patcher has detected you're running without Root Patches, and would like to install them.\n\nHowever we've detected a new version of OCLP on Github. Would you like to view this?\n\nCurrent Version: {settings.patcher_version}\nLatest Version: {version}\n\nNote: After downloading the latest OCLP version, open the app and run the 'Post Install Root Patcher' from the main menu." """
-                                    f'with icon POSIX file "{settings.app_icon_path}"',
+                                f'with icon POSIX file "{settings.app_icon_path}"',
-                                ]
+                            ]
-                                output = subprocess.run(
+                            output = subprocess.run(
-                                    args, 
+                                args, 
-                                    stdout=subprocess.PIPE,
+                                stdout=subprocess.PIPE,
-                                    stderr=subprocess.STDOUT
+                                stderr=subprocess.STDOUT
-                                )
+                            )
-                                if output.returncode == 0:
+                            if output.returncode == 0:
-                                    webbrowser.open(github_link)
+                                webbrowser.open(github_link)
                     else:
                         print("- Cannot run patching")
                 else:
                     print("- No patches detected")
+                    AutomaticSysPatch.determine_if_boot_matches(settings)
             else:
                 print("- Detected Snapshot seal not in tact, skipping")
+                AutomaticSysPatch.determine_if_boot_matches(settings)
         else:
-            print("- Auto Patch option is not supported on TUI, please use GUI")
+            print("- Auto Patch option is not supported on TUI, please use GUI")
+    
+    def determine_if_boot_matches(settings):
+        # Goal of this function is to determine whether the user
+        # is using a USB drive to Boot OpenCore but macOS does not 
+        # reside on the same drive as the USB.
+
+        # If we determine them to be mismatched, notify the user
+        # and ask if they want to install to install to disk
+
+        print("- Determining if macOS drive matches boot drive")
+
+        if settings.booted_oc_disk:
+            root_disk = settings.booted_oc_disk.strip("disk")
+            root_disk = "disk" + root_disk.split("s")[0]
+        
+            print(f"  - Boot Drive: {settings.booted_oc_disk} ({root_disk})")
+            macOS_disk = utilities.get_disk_path()
+            print(f"  - macOS Drive: {macOS_disk}")
+            physical_stores = utilities.find_apfs_physical_volume(macOS_disk)
+            print(f"  - APFS Physical Stores: {physical_stores}")
+
+            disk_match = False
+            for disk in physical_stores:
+                if root_disk in disk:
+                    print(f"- Boot drive matches macOS drive ({disk})")
+                    disk_match = True
+                    break
+            
+            if disk_match is False:
+                # Check if OpenCore is on a USB drive
+                print("- Boot Drive does not match macOS drive, checking if OpenCore is on a USB drive")
+
+                disk_info = plistlib.loads(subprocess.run(["diskutil", "info", "-plist", root_disk], stdout=subprocess.PIPE).stdout)
+                try:
+                    if disk_info["Removable"] is True:
+                        print("- Boot Disk is removable, prompting user to install to internal")
+
+                        args = [
+                            "osascript",
+                            "-e",
+                            f"""display dialog "OpenCore Legacy Patcher has detected that you are booting OpenCore from an USB or External drive.\n\nIf you would like to boot your Mac normally without a USB drive plugged in, you can install OpenCore to the internal hard drive.\n\nWould you like to launch OpenCore Legacy Patcher and install to disk?" """
+                            f'with icon POSIX file "{settings.app_icon_path}"',
+                        ]
+                        output = subprocess.run(
+                            args, 
+                            stdout=subprocess.PIPE,
+                            stderr=subprocess.STDOUT
+                        )
+                        if output.returncode == 0:
+                            print("- Launching GUI's Build/Install menu")
+                            settings.start_build_install = True
+                            gui_main.wx_python_gui(settings)
+                    else:
+                        print("- Boot Disk is not removable, skipping prompt")
+                except KeyError:
+                    print("- Unable to determine if boot disk is removable, skipping prompt")
+
+        else:
+            print("- Failed to find disk OpenCore launched from")

resources/utilities.py

@@ -407,6 +407,29 @@ def dump_constants(constants):
     with open(os.path.join(os.path.expanduser('~'), 'Desktop', 'internal_data.txt'), 'w') as f:
         f.write(str(vars(constants)))
 
+def find_apfs_physical_volume(device):
+    # ex: disk3s1s1
+    # return: [disk0s2]
+    disk_list = None
+    physical_disks = []
+    try:
+        disk_list = plistlib.loads(subprocess.run(["diskutil", "info", "-plist", device], stdout=subprocess.PIPE).stdout)
+    except TypeError:
+        pass
+
+    if disk_list:
+        try:
+            # Note: Fusion Drive Macs return multiple APFSPhysicalStores:
+            # APFSPhysicalStores:
+            #  - 0:
+            #      APFSPhysicalStore: disk0s2
+            #  - 1:
+            #      APFSPhysicalStore: disk3s2
+            for disk in disk_list["APFSPhysicalStores"]:
+                physical_disks.append(disk["APFSPhysicalStore"])
+        except KeyError:
+            pass
+    return physical_disks
 
 def clean_device_path(device_path: str):
     # ex: