Nest sys_patch libraries

gui/gui_main.py

@@ -16,7 +16,8 @@ from pathlib import Path
 import binascii
 import hashlib
 
-from resources import constants, defaults, install, installer, sys_patch_download, utilities, sys_patch_detect, sys_patch, run, generate_smbios, updates, integrity_verification, global_settings, kdk_handler
+from resources import constants, defaults, install, installer, utilities, run, generate_smbios, updates, integrity_verification, global_settings, kdk_handler
+from resources.sys_patch import sys_patch_download, sys_patch_detect, sys_patch
 from resources.build import build
 from data import model_array, os_data, smbios_data, sip_data
 from gui import menu_redirect, gui_help

resources/arguments.py

@@ -1,5 +1,6 @@
 import sys
-from resources import defaults, utilities, validation, sys_patch, sys_patch_auto
+from resources import defaults, utilities, validation
+from resources.sys_patch import sys_patch, sys_patch_auto
 from resources.build import build
 from data import model_array
 import threading

resources/cli_menu.py

@@ -2,7 +2,8 @@
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 import sys
 
-from resources import constants, install, utilities, defaults, sys_patch, installer, tui_helpers, global_settings
+from resources import constants, install, utilities, defaults, installer, tui_helpers, global_settings
+from resources.sys_patch import sys_patch
 from data import cpu_data, smbios_data, model_array, os_data, mirror_data
 
 

resources/sys_patch/sys_patch.py

@@ -38,7 +38,9 @@ import subprocess
 from pathlib import Path
 from datetime import datetime
 
-from resources import constants, utilities, sys_patch_download, sys_patch_detect, sys_patch_auto, sys_patch_helpers, kdk_handler
+from resources import constants, utilities, kdk_handler
+from resources.sys_patch import sys_patch_download, sys_patch_detect, sys_patch_auto, sys_patch_helpers
+
 from data import os_data
 
 

resources/sys_patch/sys_patch_auto.py

@@ -12,7 +12,8 @@ from pathlib import Path
 import plistlib
 import subprocess
 import webbrowser
-from resources import sys_patch_detect, utilities, sys_patch_detect, updates, global_settings
+from resources import utilities, updates, global_settings
+from resources.sys_patch import sys_patch_detect
 from gui import gui_main
 
 class AutomaticSysPatch:

resources/sys_patch/sys_patch_detect.py

@@ -3,8 +3,8 @@
 # Used when supplying data to sys_patch.py
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
-import subprocess
-from resources import constants, device_probe, utilities, sys_patch_helpers, amfi_detect
+from resources import constants, device_probe, utilities, amfi_detect
+from resources.sys_patch import sys_patch_helpers
 from data import model_array, os_data, sip_data, sys_patch_dict
 
 class detect_root_patch:

resources/validation.py

@@ -1,5 +1,5 @@
 import subprocess
-from resources import sys_patch_helpers
+from resources.sys_patch import sys_patch_helpers
 from resources.build import build
 from data import example_data, model_array, sys_patch_dict, os_data
 from pathlib import Path