Fix redirects

.gitignore

@@ -24,5 +24,5 @@ __pycache__/
 /payloads/Installer.sh
 /payloads/Info.plist
 /payloads/seed.plist
-/payloads/InstallPackage/OCLP-Install.pkg
-/payloads/InstallPackage/OCLP-Install.pkg.zip
+/payloads/OCLP-Install.pkg
+/payloads/OCLP-Install.pkg.zip

gui/gui_main.py

@@ -1476,15 +1476,12 @@ class wx_python_gui:
             print("- Stock Install.pkg is missing on Github, falling back to Nightly")
             link = self.constants.installer_pkg_url_nightly
             if not utilities.validate_link(link):
-                print("- Nightly Install.pkg is missing on Github, falling back to manual backup")
-                link = "https://github.com/khronokernel/Storage/releases/download/1.0/OCLP-Install.pkg.zip"
-                if not utilities.validate_link(link):
-                    print("- Manual backup is missing on Github, no more fallbacks remaining. Quitting")
-                    return
+                print("- Nightly Install.pkg is missing on Github, exiting")
+                return
 
         if utilities.download_file(link, self.constants.installer_pkg_zip_path):
             if Path(self.constants.installer_pkg_path).exists():
-                subprocess.run(["sudo", "rm", self.constants.installer_pkg_path])
+                subprocess.run(["rm", self.constants.installer_pkg_path])
             subprocess.run(["unzip", "-o", self.constants.installer_pkg_zip_path, "-d", self.constants.installer_pkg_path])
 
     def install_installer_pkg(self, disk):
@@ -1492,7 +1489,7 @@ class wx_python_gui:
         if Path(self.constants.installer_pkg_path).exists():
             path = utilities.grab_mount_point_from_disk(disk)
             subprocess.run(["mkdir", "-p", f"{path}/Library/Packages/"])
-            subprocess.run(["cp", f"{self.constants.installer_pkg_path}/OCLP-Install.pkg", f"{path}/Library/Packages/"])
+            subprocess.run(["cp", "-r", self.constants.installer_pkg_path, f"{path}/Library/Packages/"])
 
     def settings_menu(self, event=None):
         # Define Menu

resources/constants.py

@@ -24,7 +24,7 @@ class Constants:
         self.repo_link_latest = f"{self.repo_link}/releases/tag/{self.patcher_version}"
         self.copyright_date = "Copyright © 2020-2022 Dortania"
         self.installer_pkg_url = f"{self.repo_link_latest}/OCLP-Install.pkg.zip"
-        self.installer_pkg_url_nightly = "https://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-wxpython-offline/main/OCLP-Install.pkg"
+        self.installer_pkg_url_nightly = "http://nightly.link/dortania/OpenCore-Legacy-Patcher/workflows/build-app-wxpython-offline/main/OCLP-Install.pkg.zip"
 
         # OpenCore Versioning
         # https://github.com/acidanthera/OpenCorePkg
@@ -564,11 +564,11 @@ class Constants:
 
     @property
     def installer_pkg_path(self):
-        return self.payload_path / Path("InstallPackage/OCLP-Install.pkg")
+        return self.payload_path / Path("OCLP-Install.pkg")
     
     @property
     def installer_pkg_zip_path(self):
-        return self.payload_path / Path("InstallPackage/OCLP-Install.pkg.zip")
+        return self.payload_path / Path("OCLP-Install.pkg.zip")
 
     # Apple Payloads Paths