Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TOOLS] Enable Big Sur support. #369

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −5
Open

[TOOLS] Enable Big Sur support. #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions jumpstart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ print_usage() {
echo " -s, --high-sierra Fetch High Sierra media."
echo " -m, --mojave Fetch Mojave media."
echo " -c, --catalina Fetch Catalina media."
echo " -b, --big-sur Fetch Big Sur media."
echo
}

Expand All @@ -26,13 +27,16 @@ case $argument in
print_usage
;;
-s|--high-sierra)
"$TOOLS/FetchMacOS/fetch.sh" -v 10.13 || exit 1;
"$TOOLS/FetchMacOS/fetch.sh" -v 10.13 -k BaseSystem || exit 1;
;;
-m|--mojave)
"$TOOLS/FetchMacOS/fetch.sh" -v 10.14 || exit 1;
"$TOOLS/FetchMacOS/fetch.sh" -v 10.14 -k BaseSystem || exit 1;
;;
-b|--big-sur)
"$TOOLS/FetchMacOS/fetch.sh" -v 10.16 -c DeveloperSeed -p 001-18401-003 || exit 1;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-v 11
https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that using a DeveloperSeed is a good idea now that Big Sur is officially available.

;;
-c|--catalina|*)
"$TOOLS/FetchMacOS/fetch.sh" -v 10.15 || exit 1;
"$TOOLS/FetchMacOS/fetch.sh" -v 10.15 -k BaseSystem || exit 1;
;;
esac

Expand Down
11 changes: 9 additions & 2 deletions tools/FetchMacOS/fetch-macos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ def parse_plist(catalog_data):
class SoftwareService:
# macOS 10.15 is available in 4 different catalogs from SoftwareScan
catalogs = {
"10.16": {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"11"

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

`h```

"CustomerSeed":"https://swscan.apple.com/content/catalogs/others/index-10.16customerseed-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

"DeveloperSeed":"https://swscan.apple.com/content/catalogs/others/index-10.16seed-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
"PublicSeed":"https://swscan.apple.com/content/catalogs/others/index-10.16beta-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
"PublicRelease":"https://swscan.apple.com/content/catalogs/others/index-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
},
"10.15": {
"CustomerSeed":"https://swscan.apple.com/content/catalogs/others/index-10.15customerseed-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
"DeveloperSeed":"https://swscan.apple.com/content/catalogs/others/index-10.15seed-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog",
Expand Down Expand Up @@ -133,7 +139,8 @@ def fetchpackages(self, path, keyword=None):
@click.option('-v', '--catalog-version', default="10.15", help="Version of catalog.")
@click.option('-c', '--catalog-id', default="PublicRelease", help="Name of catalog.")
@click.option('-p', '--product-id', default="", help="Product ID (as seen in SoftwareUpdate).")
def fetchmacos(output_dir="BaseSystem/", catalog_version="10.15", catalog_id="PublicRelease", product_id=""):
@click.option('-k', '--keyword', default=None, help="Keyword filter for packages.")
def fetchmacos(output_dir="BaseSystem/", catalog_version="10.15", catalog_id="PublicRelease", product_id="", keyword=None):
# Get the remote catalog data
remote = SoftwareService(catalog_version, catalog_id)
catalog = remote.getcatalog()
Expand All @@ -152,7 +159,7 @@ def fetchmacos(output_dir="BaseSystem/", catalog_version="10.15", catalog_id="Pu
logging.info("Selected macOS Product: {}".format(product_id))

# Download package to disk
product.fetchpackages(output_dir, keyword="BaseSystem")
product.fetchpackages(output_dir, keyword=keyword)

if __name__ == "__main__":
fetchmacos()