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

Properly parse sucatalogs for Big Sur beta installer

Browse Source
This commit is contained in:
Greg Neagle 2020-06-22 16:25:01 -07:00
parent 9f9ec905e8
commit 409ea6c9a9
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
installinstallmacos.py
View File

@ -312,7 +312,7 @@ def get_server_metadata(catalog, product_key, workdir, ignore_cache=False):
print('Could not replicate %s: %s' % (url, err), file=sys.stderr) print('Could not replicate %s: %s' % (url, err), file=sys.stderr)
return None return None
except KeyError: except KeyError:
print('Malformed catalog.', file=sys.stderr) #print('Malformed catalog.', file=sys.stderr)
return None return None
@ -329,6 +329,10 @@ def parse_dist(filename):
print('Error reading %s: %s' % (filename, err), file=sys.stderr) print('Error reading %s: %s' % (filename, err), file=sys.stderr)
return dist_info return dist_info
titles = dom.getElementsByTagName('title')
if titles:
dist_info['title_from_dist'] = titles[0].firstChild.wholeText
auxinfos = dom.getElementsByTagName('auxinfo') auxinfos = dom.getElementsByTagName('auxinfo')
if not auxinfos: if not auxinfos:
return dist_info return dist_info
@ -392,8 +396,7 @@ def find_mac_os_installers(catalog):
product = catalog['Products'][product_key] product = catalog['Products'][product_key]
try: try:
if product['ExtendedMetaInfo'][ if product['ExtendedMetaInfo'][
'InstallAssistantPackageIdentifiers'][ 'InstallAssistantPackageIdentifiers']:
'OSInstall'] == 'com.apple.mpkg.OSInstall':
mac_os_installer_products.append(product_key) mac_os_installer_products.append(product_key)
except KeyError: except KeyError:
continue continue
@ -409,20 +412,29 @@ def os_installer_product_info(catalog, workdir, ignore_cache=False):
filename = get_server_metadata(catalog, product_key, workdir) filename = get_server_metadata(catalog, product_key, workdir)
if filename: if filename:
product_info[product_key] = parse_server_metadata(filename) product_info[product_key] = parse_server_metadata(filename)
product = catalog['Products'][product_key] else:
product_info[product_key]['PostDate'] = product['PostDate'] print('No server metadata for %s' % product_key)
distributions = product['Distributions'] product_info[product_key]['title'] = None
dist_url = distributions.get('English') or distributions.get('en') product_info[product_key]['version'] = None
try:
dist_path = replicate_url( product = catalog['Products'][product_key]
dist_url, root_dir=workdir, ignore_cache=ignore_cache) product_info[product_key]['PostDate'] = product['PostDate']
except ReplicationError as err: distributions = product['Distributions']
print('Could not replicate %s: %s' % (dist_url, err), dist_url = distributions.get('English') or distributions.get('en')
file=sys.stderr) try:
else: dist_path = replicate_url(
dist_info = parse_dist(dist_path) dist_url, root_dir=workdir, ignore_cache=ignore_cache)
product_info[product_key]['DistributionPath'] = dist_path except ReplicationError as err:
product_info[product_key].update(dist_info) print('Could not replicate %s: %s' % (dist_url, err),
file=sys.stderr)
else:
dist_info = parse_dist(dist_path)
product_info[product_key]['DistributionPath'] = dist_path
product_info[product_key].update(dist_info)
if not product_info[product_key]['title']:
product_info[product_key]['title'] = dist_info.get('title_from_dist')
if not product_info[product_key]['version']:
product_info[product_key]['version'] = dist_info.get('VERSION')
return product_info return product_info
@ -523,14 +535,14 @@ def main():
exit(-1) exit(-1)
# display a menu of choices (some seed catalogs have multiple installers) # display a menu of choices (some seed catalogs have multiple installers)
print('%2s %12s %10s %8s %11s %s' print('%2s %14s %10s %8s %11s %s'
% ('#', 'ProductID', 'Version', 'Build', 'Post Date', 'Title')) % ('#', 'ProductID', 'Version', 'Build', 'Post Date', 'Title'))
for index, product_id in enumerate(product_info): for index, product_id in enumerate(product_info):
print('%2s %12s %10s %8s %11s %s' % ( print('%2s %14s %10s %8s %11s %s' % (
index + 1, index + 1,
product_id, product_id,
product_info[product_id]['version'], product_info[product_id].get('version', 'UNKNOWN'),
product_info[product_id]['BUILD'], 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']
)) ))