diff --git a/OpenCore-Patcher.command b/OpenCore-Patcher.command index 639215903..6ff2847e6 100755 --- a/OpenCore-Patcher.command +++ b/OpenCore-Patcher.command @@ -7,8 +7,8 @@ import subprocess import sys from pathlib import Path -from Resources import Build, cli_menu, Constants, ModelArray, sys_patch, Utilities, device_probe, os_probe, defaults, arguments -from Data import smbios_data, cpu_data +from resources import Build, cli_menu, Constants, ModelArray, sys_patch, Utilities, device_probe, os_probe, defaults, arguments +from data import smbios_data, cpu_data class OpenCoreLegacyPatcher: def __init__(self): diff --git a/OpenCore-Patcher.spec b/OpenCore-Patcher.spec index 4bf2756ab..48fe40bb0 100644 --- a/OpenCore-Patcher.spec +++ b/OpenCore-Patcher.spec @@ -1,7 +1,7 @@ # -*- mode: python ; coding: utf-8 -*- import sys, os sys.path.append(os.path.abspath(os.getcwd())) -from Resources import Constants +from resources import Constants block_cipher = None diff --git a/create-offline-build.py b/create-offline-build.py index b22cb8335..8da2e917b 100644 --- a/create-offline-build.py +++ b/create-offline-build.py @@ -1,5 +1,5 @@ import subprocess -from Resources import Constants +from resources import Constants patcher_support_pkg_version = Constants.Constants().patcher_support_pkg_version binary_packages = ["10.14-Mojave", "10.15-Catalina", "11-Big-Sur", "12-Monterey"] diff --git a/data-tmp/bluetooth_data.py b/data/bluetooth_data.py similarity index 100% rename from data-tmp/bluetooth_data.py rename to data/bluetooth_data.py diff --git a/data-tmp/cpu_data.py b/data/cpu_data.py similarity index 100% rename from data-tmp/cpu_data.py rename to data/cpu_data.py diff --git a/data-tmp/example_data.py b/data/example_data.py similarity index 99% rename from data-tmp/example_data.py rename to data/example_data.py index d332376ed..dbb5e576a 100644 --- a/data-tmp/example_data.py +++ b/data/example_data.py @@ -1,6 +1,6 @@ # Example Hardware probe of multiple models # To be used when running validation tests -from Resources import device_probe +from resources import device_probe class MacBook: diff --git a/data-tmp/os_data.py b/data/os_data.py similarity index 100% rename from data-tmp/os_data.py rename to data/os_data.py diff --git a/data-tmp/pci_data.py b/data/pci_data.py similarity index 100% rename from data-tmp/pci_data.py rename to data/pci_data.py diff --git a/data-tmp/sip_data.py b/data/sip_data.py similarity index 100% rename from data-tmp/sip_data.py rename to data/sip_data.py diff --git a/data-tmp/smbios_data.py b/data/smbios_data.py similarity index 99% rename from data-tmp/smbios_data.py rename to data/smbios_data.py index d0a85723c..ec1cd696e 100644 --- a/data-tmp/smbios_data.py +++ b/data/smbios_data.py @@ -1,7 +1,7 @@ # Defines Model Data -from Resources import device_probe -from Data import cpu_data, os_data, bluetooth_data +from resources import device_probe +from data import cpu_data, os_data, bluetooth_data smbios_dictionary = { "MacBook1,1": { diff --git a/data-tmp/sys_patch_data.py b/data/sys_patch_data.py similarity index 100% rename from data-tmp/sys_patch_data.py rename to data/sys_patch_data.py diff --git a/merge_gui.py b/merge_gui.py index d26acc93e..0b2f74d2e 100644 --- a/merge_gui.py +++ b/merge_gui.py @@ -2,7 +2,7 @@ # Copyright (C) 2021 Mykola Grymalyuk import plistlib from pathlib import Path -from Resources import Constants +from resources import Constants app_path = Path.cwd() / Path ("OpenCore Patcher.app/Contents/Info.plist") info = plistlib.load(Path(app_path).open("rb")) diff --git a/resources-tmp/Build.py b/resources/Build.py similarity index 99% rename from resources-tmp/Build.py rename to resources/Build.py index fa0606ee0..7f8589001 100644 --- a/resources-tmp/Build.py +++ b/resources/Build.py @@ -14,8 +14,8 @@ import ast from pathlib import Path from datetime import date -from Resources import Constants, ModelArray, Utilities, device_probe, generate_smbios -from Data import smbios_data, bluetooth_data, cpu_data, os_data +from resources import Constants, ModelArray, Utilities, device_probe, generate_smbios +from data import smbios_data, bluetooth_data, cpu_data, os_data def rmtree_handler(func, path, exc_info): diff --git a/resources-tmp/Constants.py b/resources/Constants.py similarity index 99% rename from resources-tmp/Constants.py rename to resources/Constants.py index 2be9badd6..110ee6883 100644 --- a/resources-tmp/Constants.py +++ b/resources/Constants.py @@ -7,7 +7,7 @@ from __future__ import print_function from pathlib import Path from typing import Optional -from Resources import device_probe +from resources import device_probe class Constants: diff --git a/resources-tmp/ModelArray.py b/resources/ModelArray.py similarity index 100% rename from resources-tmp/ModelArray.py rename to resources/ModelArray.py diff --git a/resources-tmp/Utilities.py b/resources/Utilities.py similarity index 99% rename from resources-tmp/Utilities.py rename to resources/Utilities.py index 2e02c23d0..6aec3590f 100644 --- a/resources-tmp/Utilities.py +++ b/resources/Utilities.py @@ -20,8 +20,8 @@ except ImportError: except ImportError: raise Exception("Missing requests library!\nPlease run the following before starting OCLP:\npip3 install requests") -from Resources import Constants, ioreg, device_probe -from Data import sip_data +from resources import Constants, ioreg, device_probe +from data import sip_data def hexswap(input_hex: str): diff --git a/resources-tmp/__init__.py b/resources/__init__.py similarity index 100% rename from resources-tmp/__init__.py rename to resources/__init__.py diff --git a/resources-tmp/arguments.py b/resources/arguments.py similarity index 99% rename from resources-tmp/arguments.py rename to resources/arguments.py index 5193cc478..29be47b4b 100644 --- a/resources-tmp/arguments.py +++ b/resources/arguments.py @@ -1,8 +1,8 @@ import argparse import sys import subprocess -from Resources import ModelArray, defaults, Build -from Data import example_data +from resources import ModelArray, defaults, Build +from data import example_data # Generic building args class arguments: diff --git a/resources-tmp/cli_menu.py b/resources/cli_menu.py similarity index 99% rename from resources-tmp/cli_menu.py rename to resources/cli_menu.py index 49b411559..4ed189820 100644 --- a/resources-tmp/cli_menu.py +++ b/resources/cli_menu.py @@ -3,8 +3,8 @@ from __future__ import print_function import subprocess -from Resources import Constants, Utilities, defaults, ModelArray, sys_patch -from Data import cpu_data, smbios_data +from resources import Constants, Utilities, defaults, ModelArray, sys_patch +from data import cpu_data, smbios_data class MenuOptions: diff --git a/resources-tmp/defaults.py b/resources/defaults.py similarity index 98% rename from resources-tmp/defaults.py rename to resources/defaults.py index 94f6d0aec..f5686303e 100644 --- a/resources-tmp/defaults.py +++ b/resources/defaults.py @@ -1,5 +1,5 @@ # Generate Default Data -from Resources import Utilities, device_probe, ModelArray +from resources import Utilities, device_probe, ModelArray class generate_defaults(): def probe(model, host_is_target, settings): diff --git a/resources-tmp/device_probe.py b/resources/device_probe.py similarity index 99% rename from resources-tmp/device_probe.py rename to resources/device_probe.py index e2f06c38d..287aaa7fa 100644 --- a/resources-tmp/device_probe.py +++ b/resources/device_probe.py @@ -10,8 +10,8 @@ import subprocess from dataclasses import dataclass, field from typing import Any, ClassVar, Optional, Type, Union -from Resources import Utilities, ioreg -from Data import pci_data +from resources import Utilities, ioreg +from data import pci_data @dataclass diff --git a/resources-tmp/generate_smbios.py b/resources/generate_smbios.py similarity index 97% rename from resources-tmp/generate_smbios.py rename to resources/generate_smbios.py index 5a8732b14..5b9b34220 100644 --- a/resources-tmp/generate_smbios.py +++ b/resources/generate_smbios.py @@ -1,5 +1,5 @@ -from Data import smbios_data, os_data -from Resources import Utilities +from data import smbios_data, os_data +from resources import Utilities def set_smbios_model_spoof(model): try: diff --git a/resources-tmp/ioreg.py b/resources/ioreg.py similarity index 100% rename from resources-tmp/ioreg.py rename to resources/ioreg.py diff --git a/resources-tmp/mount_root.py b/resources/mount_root.py similarity index 91% rename from resources-tmp/mount_root.py rename to resources/mount_root.py index bcaf282e8..b433344ef 100644 --- a/resources-tmp/mount_root.py +++ b/resources/mount_root.py @@ -1,6 +1,6 @@ # Logic for mounting root volume -from Data import os_data -from Resources import Utilities +from data import os_data +from resources import Utilities import plistlib import subprocess diff --git a/resources-tmp/os_probe.py b/resources/os_probe.py similarity index 100% rename from resources-tmp/os_probe.py rename to resources/os_probe.py diff --git a/resources-tmp/sys_patch.py b/resources/sys_patch.py similarity index 99% rename from resources-tmp/sys_patch.py rename to resources/sys_patch.py index 1d425a54b..b040048f2 100644 --- a/resources-tmp/sys_patch.py +++ b/resources/sys_patch.py @@ -11,8 +11,8 @@ import subprocess import zipfile from pathlib import Path -from Resources import Constants, device_probe, ModelArray, Utilities -from Data import sip_data, sys_patch_data +from resources import Constants, device_probe, ModelArray, Utilities +from data import sip_data, sys_patch_data class PatchSysVolume: