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

New --warnings option, Notes not shown without this flag

Browse Source
This commit is contained in:
Graham R Pugh 2020-07-31 14:09:04 +02:00
parent 701bdbe3f2
commit 70fda7b098
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
installinstallmacos.py
View File

@ -527,7 +527,7 @@ def find_mac_os_installers(catalog):
return mac_os_installer_products return mac_os_installer_products
def os_installer_product_info(catalog, workdir, ignore_cache=False): def os_installer_product_info(catalog, workdir, warnings, ignore_cache=False):
"""Returns a dict of info about products that look like macOS installers""" """Returns a dict of info about products that look like macOS installers"""
product_info = {} product_info = {}
installer_products = find_mac_os_installers(catalog) installer_products = find_mac_os_installers(catalog)
@ -537,7 +537,8 @@ def os_installer_product_info(catalog, workdir, ignore_cache=False):
if filename: if filename:
product_info[product_key] = parse_server_metadata(filename) product_info[product_key] = parse_server_metadata(filename)
else: else:
print("WARNING: No server metadata for %s\n" % product_key) if warnings:
print("WARNING: No server metadata for %s\n" % product_key)
product_info[product_key]["title"] = None product_info[product_key]["title"] = None
product_info[product_key]["version"] = None product_info[product_key]["version"] = None
@ -716,6 +717,9 @@ def main():
help="Automatically select the appropriate valid build " help="Automatically select the appropriate valid build "
"for the current device.", "for the current device.",
) )
parser.add_argument(
"--warnings", action="store_true", help="Show warnings in the listed output",
)
parser.add_argument( parser.add_argument(
"--beta", "--beta",
action="store_true", action="store_true",
@ -786,7 +790,7 @@ def main():
su_catalog_url, args.workdir, ignore_cache=args.ignore_cache su_catalog_url, args.workdir, ignore_cache=args.ignore_cache
) )
product_info = os_installer_product_info( product_info = os_installer_product_info(
catalog, args.workdir, ignore_cache=args.ignore_cache catalog, args.workdir, args.warnings, ignore_cache=args.ignore_cache
) )
if not product_info: if not product_info:
print("No macOS installer products found in the sucatalog.", file=sys.stderr) print("No macOS installer products found in the sucatalog.", file=sys.stderr)
@ -799,25 +803,37 @@ def main():
valid_build_found = False valid_build_found = False
# display a menu of choices (some seed catalogs have multiple installers) # display a menu of choices (some seed catalogs have multiple installers)
validity_header = ""
if args.warnings:
validity_header = "Notes/Warnings"
print( print(
"%2s %-15s %-10s %-8s %-11s %-30s %s" "%2s %-15s %-10s %-8s %-11s %-30s %s"
% ("#", "ProductID", "Version", "Build", "Post Date", "Title", "Notes") % ("#", "ProductID", "Version", "Build", "Post Date", "Title", validity_header)
) )
for index, product_id in enumerate(product_info): for index, product_id in enumerate(product_info):
not_valid = "" not_valid = ""
if not product_info[product_id]["UnsupportedModels"]: if (
not_valid += "WARNING: No unsupported model data " not product_info[product_id]["UnsupportedModels"]
and not product_info[product_id]["BoardIDs"]
):
not_valid = "No unsupported Model or supported Board ID data"
else: else:
if ( if not product_info[product_id]["UnsupportedModels"]:
hw_model in product_info[product_id]["UnsupportedModels"] not_valid = "No unsupported model data "
and is_vm == False else:
): if (
not_valid = "Unsupported Model Identifier" hw_model in product_info[product_id]["UnsupportedModels"]
if not product_info[product_id]["BoardIDs"]: and is_vm == False
not_valid += "WARNING: No supported Board ID data " ):
else: not_valid = "Unsupported Model Identifier"
if board_id not in product_info[product_id]["BoardIDs"] and is_vm == False: if not product_info[product_id]["BoardIDs"]:
not_valid = "Unsupported Board ID" not_valid += "No supported Board ID data "
else:
if (
board_id not in product_info[product_id]["BoardIDs"]
and is_vm == False
):
not_valid = "Unsupported Board ID"
if ( if (
get_latest_version(build_info[0], product_info[product_id]["version"]) get_latest_version(build_info[0], product_info[product_id]["version"])
!= product_info[product_id]["version"] != product_info[product_id]["version"]
@ -825,6 +841,9 @@ def main():
not_valid = "Unsupported macOS version" not_valid = "Unsupported macOS version"
else: else:
valid_build_found = True valid_build_found = True
validity_info = ""
if args.warnings:
validity_info = not_valid
print( print(
"%2s %-15s %-10s %-8s %-11s %-30s %s" "%2s %-15s %-10s %-8s %-11s %-30s %s"
@ -835,7 +854,7 @@ def main():
product_info[product_id].get("BUILD", "UNKNOWN"), product_info[product_id].get("BUILD", "UNKNOWN"),
product_info[product_id]["PostDate"].strftime("%Y-%m-%d"), product_info[product_id]["PostDate"].strftime("%Y-%m-%d"),
product_info[product_id]["title"], product_info[product_id]["title"],
not_valid, validity_info,
) )
) )
@ -945,7 +964,7 @@ def main():
# Output a plist of available updates and quit if list option chosen # Output a plist of available updates and quit if list option chosen
if args.list: if args.list:
write_plist(pl, output_plist) write_plist(pl, output_plist)
print("Valid seeding programs are: %s" % ", ".join(get_seeding_programs())) print("\nValid seeding programs are: %s\n" % ", ".join(get_seeding_programs()))
exit(0) exit(0)
# check for validity of specified build if argument supplied # check for validity of specified build if argument supplied