mirror of
https://github.com/dortania/OpenCore-Legacy-Patcher.git
synced 2026-06-20 06:10:00 +10:00
Merge branch 'main' into ventura-alpha
This commit is contained in:
@@ -1232,7 +1232,7 @@ B. Exit
|
|||||||
# Add mirror of 11.2.3 for users who want it
|
# 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'])])
|
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:
|
for app in available_installers:
|
||||||
if available_installers[app]['Variant'] in ["DeveloperSeed", "PublicSeed"]:
|
if available_installers[app]['Variant'] in ["CustomerSeed", "DeveloperSeed", "PublicSeed"]:
|
||||||
variant = " Beta"
|
variant = " Beta"
|
||||||
else:
|
else:
|
||||||
variant = ""
|
variant = ""
|
||||||
|
|||||||
@@ -163,7 +163,7 @@ def list_downloadable_macOS_installers(download_path, catalog):
|
|||||||
elif catalog == "PublicSeed":
|
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"
|
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:
|
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:
|
if utilities.verify_network_connection(link) is True:
|
||||||
try:
|
try:
|
||||||
@@ -198,10 +198,10 @@ def list_downloadable_macOS_installers(download_path, catalog):
|
|||||||
elif "seed" in catalog_url:
|
elif "seed" in catalog_url:
|
||||||
catalog_url = "DeveloperSeed"
|
catalog_url = "DeveloperSeed"
|
||||||
else:
|
else:
|
||||||
catalog_url = "Unknown"
|
catalog_url = "Public"
|
||||||
except KeyError:
|
except KeyError:
|
||||||
# Assume CustomerSeed if no catalog URL is found
|
# Assume Public if no catalog URL is found
|
||||||
catalog_url = "CustomerSeed"
|
catalog_url = "Public"
|
||||||
for ia_package in catalog_plist["Products"][item]["Packages"]:
|
for ia_package in catalog_plist["Products"][item]["Packages"]:
|
||||||
if "InstallAssistant.pkg" in ia_package["URL"]:
|
if "InstallAssistant.pkg" in ia_package["URL"]:
|
||||||
download_link = ia_package["URL"]
|
download_link = ia_package["URL"]
|
||||||
@@ -240,7 +240,7 @@ def only_list_newest_installers(available_apps):
|
|||||||
# First determine the largest version
|
# First determine the largest version
|
||||||
for ia in available_apps:
|
for ia in available_apps:
|
||||||
if available_apps[ia]["Version"].startswith(version):
|
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(".")
|
remote_version = available_apps[ia]["Version"].split(".")
|
||||||
if remote_version[0] == "10":
|
if remote_version[0] == "10":
|
||||||
remote_version.pop(0)
|
remote_version.pop(0)
|
||||||
@@ -256,7 +256,7 @@ def only_list_newest_installers(available_apps):
|
|||||||
|
|
||||||
# Now remove all versions that are not the largest
|
# Now remove all versions that are not the largest
|
||||||
for ia in list(available_apps):
|
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
|
# Remove Beta builds from default listing
|
||||||
available_apps.pop(ia)
|
available_apps.pop(ia)
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user