Merge branch 'main' into ventura-alpha

dortania · Sep 25, 2022 · 4ef2c00 · 4ef2c00
2 parents 9dcd42d + d7c6634
commit 4ef2c00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/resources/cli_menu.py b/resources/cli_menu.py
@@ -1232,7 +1232,7 @@ def download_macOS_installer(self):
                 # Add mirror of 11.2.3 for users who want it
                 options.append([f"macOS {mirror_data.Install_macOS_Big_Sur_11_2_3['Version']} ({mirror_data.Install_macOS_Big_Sur_11_2_3['Build']} - {utilities.human_fmt(mirror_data.Install_macOS_Big_Sur_11_2_3['Size'])} - {mirror_data.Install_macOS_Big_Sur_11_2_3['Source']})", lambda: self.download_install_assistant(mirror_data.Install_macOS_Big_Sur_11_2_3['Link'])])
                 for app in available_installers:
-                    if available_installers[app]['Variant'] in ["DeveloperSeed", "PublicSeed"]:
+                    if available_installers[app]['Variant'] in ["CustomerSeed", "DeveloperSeed", "PublicSeed"]:
                         variant = " Beta"
                     else:
                         variant = ""

diff --git a/resources/installer.py b/resources/installer.py
@@ -163,7 +163,7 @@ def list_downloadable_macOS_installers(download_path, catalog):
     elif catalog == "PublicSeed":
         link = "https://swscan.apple.com/content/catalogs/others/index-13beta-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
     else:
-        link = "https://swscan.apple.com/content/catalogs/others/index-13customerseed-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
+        link = "https://swscan.apple.com/content/catalogs/others/index-13-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
 
     if utilities.verify_network_connection(link) is True:
         try:
@@ -198,10 +198,10 @@ def list_downloadable_macOS_installers(download_path, catalog):
                             elif "seed" in catalog_url:
                                 catalog_url = "DeveloperSeed"
                             else:
-                                catalog_url = "Unknown"
+                                catalog_url = "Public"
                         except KeyError:
-                            # Assume CustomerSeed if no catalog URL is found
-                            catalog_url = "CustomerSeed"
+                            # Assume Public if no catalog URL is found
+                            catalog_url = "Public"
                         for ia_package in catalog_plist["Products"][item]["Packages"]:
                             if "InstallAssistant.pkg" in ia_package["URL"]:
                                 download_link = ia_package["URL"]
@@ -240,7 +240,7 @@ def only_list_newest_installers(available_apps):
         # First determine the largest version
         for ia in available_apps:
             if available_apps[ia]["Version"].startswith(version):
-                if available_apps[ia]["Variant"] not in ["DeveloperSeed", "PublicSeed"]:
+                if available_apps[ia]["Variant"] not in ["CustomerSeed", "DeveloperSeed", "PublicSeed"]:
                     remote_version = available_apps[ia]["Version"].split(".")
                     if remote_version[0] == "10":
                         remote_version.pop(0)
@@ -256,7 +256,7 @@ def only_list_newest_installers(available_apps):
 
         # Now remove all versions that are not the largest
         for ia in list(available_apps):
-            if available_apps[ia]["Variant"] in ["DeveloperSeed", "PublicSeed"]:
+            if available_apps[ia]["Variant"] in ["CustomerSeed", "DeveloperSeed", "PublicSeed"]:
                 # Remove Beta builds from default listing
                 available_apps.pop(ia)
                 continue