Move utilities directory to support

opencore_legacy_patcher/sys_patch/sys_patch.py

@@ -44,11 +44,20 @@ from pathlib import Path
 from datetime import datetime
 
 from .. import constants
-from ..utilities import utilities, kdk_handler
-from ..sys_patch import sys_patch_detect, sys_patch_auto, sys_patch_helpers, sys_patch_generate
 
 from ..datasets import os_data
 
+from ..support import (
+    utilities,
+    kdk_handler
+)
+from . import (
+    sys_patch_detect,
+    sys_patch_auto,
+    sys_patch_helpers,
+    sys_patch_generate
+)
+
 
 class PatchSysVolume:
     def __init__(self, model: str, global_constants: constants.Constants, hardware_details: list = None) -> None:

opencore_legacy_patcher/sys_patch/sys_patch_auto.py

@@ -15,16 +15,17 @@ import webbrowser
 
 from pathlib import Path
 
+from . import sys_patch_detect
+
 from .. import constants
 
 from ..datasets import css_data
-from ..sys_patch import sys_patch_detect
 
 from ..wx_gui import (
     gui_entry,
     gui_support
 )
-from ..utilities import (
+from ..support import (
     utilities,
     updates,
     global_settings,

opencore_legacy_patcher/sys_patch/sys_patch_detect.py

@@ -15,7 +15,7 @@ from ..detections import (
     amfi_detect,
     device_probe
 )
-from ..utilities import (
+from ..support import (
     kdk_handler,
     network_handler,
     utilities

opencore_legacy_patcher/sys_patch/sys_patch_generate.py

@@ -7,7 +7,7 @@ import logging
 from .. import constants
 
 from ..datasets import sys_patch_dict
-from ..utilities import utilities
+from ..support import utilities
 from ..detections import device_probe
 
 

opencore_legacy_patcher/sys_patch/sys_patch_helpers.py

@@ -15,7 +15,7 @@ from .. import constants
 
 from ..datasets import os_data
 
-from ..utilities import (
+from ..support import (
     bplist,
     generate_smbios,
     utilities