From 7543606a1eaaebba8b98531f73e99a31847714b5 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <khronokernel@icloud.com>
Date: Sun, 13 Nov 2022 19:25:55 -0700
Subject: [PATCH] Nest sys_patch libraries

---
 gui/gui_main.py                                 | 3 ++-
 resources/arguments.py                          | 3 ++-
 resources/cli_menu.py                           | 3 ++-
 resources/{ => sys_patch}/sys_patch.py          | 4 +++-
 resources/{ => sys_patch}/sys_patch_auto.py     | 3 ++-
 resources/{ => sys_patch}/sys_patch_detect.py   | 4 ++--
 resources/{ => sys_patch}/sys_patch_download.py | 0
 resources/{ => sys_patch}/sys_patch_helpers.py  | 0
 resources/validation.py                         | 2 +-
 9 files changed, 14 insertions(+), 8 deletions(-)
 rename resources/{ => sys_patch}/sys_patch.py (99%)
 rename resources/{ => sys_patch}/sys_patch_auto.py (99%)
 rename resources/{ => sys_patch}/sys_patch_detect.py (99%)
 rename resources/{ => sys_patch}/sys_patch_download.py (100%)
 rename resources/{ => sys_patch}/sys_patch_helpers.py (100%)

diff --git a/gui/gui_main.py b/gui/gui_main.py
index 0df811e0b..cdef089ad 100644
--- a/gui/gui_main.py
+++ b/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
diff --git a/resources/arguments.py b/resources/arguments.py
index ddddc2167..d31308830 100644
--- a/resources/arguments.py
+++ b/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
diff --git a/resources/cli_menu.py b/resources/cli_menu.py
index ff91cc916..81e90fcde 100644
--- a/resources/cli_menu.py
+++ b/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
 
 
diff --git a/resources/sys_patch.py b/resources/sys_patch/sys_patch.py
similarity index 99%
rename from resources/sys_patch.py
rename to resources/sys_patch/sys_patch.py
index c04c90f54..87709ea5d 100644
--- a/resources/sys_patch.py
+++ b/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
 
 
diff --git a/resources/sys_patch_auto.py b/resources/sys_patch/sys_patch_auto.py
similarity index 99%
rename from resources/sys_patch_auto.py
rename to resources/sys_patch/sys_patch_auto.py
index 78365bc73..95debd60d 100644
--- a/resources/sys_patch_auto.py
+++ b/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:
diff --git a/resources/sys_patch_detect.py b/resources/sys_patch/sys_patch_detect.py
similarity index 99%
rename from resources/sys_patch_detect.py
rename to resources/sys_patch/sys_patch_detect.py
index 01fc6086d..9146e0f1a 100644
--- a/resources/sys_patch_detect.py
+++ b/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:
diff --git a/resources/sys_patch_download.py b/resources/sys_patch/sys_patch_download.py
similarity index 100%
rename from resources/sys_patch_download.py
rename to resources/sys_patch/sys_patch_download.py
diff --git a/resources/sys_patch_helpers.py b/resources/sys_patch/sys_patch_helpers.py
similarity index 100%
rename from resources/sys_patch_helpers.py
rename to resources/sys_patch/sys_patch_helpers.py
diff --git a/resources/validation.py b/resources/validation.py
index 4c3829f94..7ad736ce3 100644
--- a/resources/validation.py
+++ b/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