External/macadmin-scripts
1
0
Fork 0
mirror of https://github.com/grahampugh/macadmin-scripts.git synced 2025-12-17 17:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

add catalog override option

Browse Source
This commit is contained in:
Graham Pugh 2022-02-03 07:43:44 +01:00
parent e2d5ee2e2c
commit f97e262faf
1 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
installinstallmacos.py
View File

@ -47,21 +47,31 @@ from distutils.version import LooseVersion
DEFAULT_SUCATALOGS = { DEFAULT_SUCATALOGS = {
"17": "https://swscan.apple.com/content/catalogs/others/" "17": (
"index-10.13-10.12-10.11-10.10-10.9" "https://swscan.apple.com/content/catalogs/others/"
"-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog", "index-10.13-10.12-10.11-10.10-10.9"
"18": "https://swscan.apple.com/content/catalogs/others/" "-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
"index-10.14-10.13-10.12-10.11-10.10-10.9" ),
"-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog", "18": (
"19": "https://swscan.apple.com/content/catalogs/others/" "https://swscan.apple.com/content/catalogs/others/"
"index-10.15-10.14-10.13-10.12-10.11-10.10-10.9" "index-10.14-10.13-10.12-10.11-10.10-10.9"
"-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog", "-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
"20": "https://swscan.apple.com/content/catalogs/others/" ),
"index-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9" "19": (
"-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog", "https://swscan.apple.com/content/catalogs/others/"
"21": "https://swscan.apple.com/content/catalogs/others/" "index-10.15-10.14-10.13-10.12-10.11-10.10-10.9"
"index-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9" "-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
"-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog", ),
"20": (
"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"
),
"21": (
"https://swscan.apple.com/content/catalogs/others/"
"index-12-10.16-10.15-10.14-10.13-10.12-10.11-10.10-10.9"
"-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog"
),
} }
SEED_CATALOGS_PLIST = ( SEED_CATALOGS_PLIST = (
@ -233,9 +243,10 @@ def get_seeding_programs():
return "" return ""
def get_default_catalog(): def get_default_catalog(darwin_major=None):
"""Returns the default softwareupdate catalog for the current OS""" """Returns the default softwareupdate catalog for the current OS"""
darwin_major = os.uname()[2].split(".")[0] if not darwin_major:
darwin_major = os.uname()[2].split(".")[0]
return DEFAULT_SUCATALOGS.get(darwin_major) return DEFAULT_SUCATALOGS.get(darwin_major)
@ -678,10 +689,13 @@ def os_installer_product_info(
def get_latest_version(current_item, latest_item): def get_latest_version(current_item, latest_item):
"""Compares versions between two values and returns the latest (highest) value""" """Compares versions between two values and returns the latest (highest) value"""
if LooseVersion(current_item) > LooseVersion(latest_item): try:
if LooseVersion(current_item) > LooseVersion(latest_item):
return current_item
else:
return latest_item
except TypeError:
return current_item return current_item
else:
return latest_item
def replicate_product(catalog, product_id, workdir, ignore_cache=False): def replicate_product(catalog, product_id, workdir, ignore_cache=False):
@ -751,6 +765,12 @@ def main():
help="Software Update catalog URL. This option " help="Software Update catalog URL. This option "
"overrides any seedprogram option.", "overrides any seedprogram option.",
) )
parser.add_argument(
"--catalog",
default="",
help="Software Update catalog for a specific macOS version. "
"This option overrides any seedprogram option.",
)
parser.add_argument( parser.add_argument(
"--workdir", "--workdir",
metavar="path_to_working_dir", metavar="path_to_working_dir",
@ -900,7 +920,9 @@ def main():
su_catalog_url = args.catalogurl su_catalog_url = args.catalogurl
elif args.seedprogram: elif args.seedprogram:
su_catalog_url = get_seed_catalog(args.seedprogram) su_catalog_url = get_seed_catalog(args.seedprogram)
if not su_catalog_url: if su_catalog_url:
print("Using catalog for Seed Program {}.\n".format(args.seedprogram))
else:
print( print(
"Could not find a catalog url for seed program %s" % args.seedprogram, "Could not find a catalog url for seed program %s" % args.seedprogram,
file=sys.stderr, file=sys.stderr,
@ -910,6 +932,16 @@ def main():
file=sys.stderr, file=sys.stderr,
) )
exit(-1) exit(-1)
elif args.catalog:
su_catalog_url = get_default_catalog(args.catalog)
if su_catalog_url:
print("Using catalog for Darwin v{}.\n".format(args.catalog))
else:
print(
"Could not find a default catalog url for this OS version.",
file=sys.stderr,
)
exit(-1)
else: else:
su_catalog_url = get_default_catalog() su_catalog_url = get_default_catalog()
if not su_catalog_url: if not su_catalog_url: