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

Merge branch 'main' of https://github.com/munki/macadmin-scripts into munki-main

Browse Source
This commit is contained in:
Graham R Pugh 2021-03-10 11:47:42 +01:00
commit ccb56e4443
1 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
installinstallmacos.py
View File

@ -57,7 +57,7 @@ DEFAULT_SUCATALOGS = {
"index-10.15-10.14-10.13-10.12-10.11-10.10-10.9" "index-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/" "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" "index-11-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",
} }
@ -401,21 +401,45 @@ def replicate_url(
options = "-fL" options = "-fL"
else: else:
options = "-sfL" options = "-sfL"
curl_cmd = ["/usr/bin/curl", options, "--create-dirs", "-o", local_file_path] need_download = True
if not full_url.endswith(".gz"): while need_download:
# stupid hack for stupid Apple behavior where it sometimes returns curl_cmd = [
# compressed files even when not asked for "/usr/bin/curl",
curl_cmd.append("--compressed") options,
if not ignore_cache and os.path.exists(local_file_path): "--create-dirs",
curl_cmd.extend(["-z", local_file_path]) "-o",
if attempt_resume: local_file_path,
curl_cmd.extend(["-C", "-"]) "-w",
curl_cmd.append(full_url) "%{http_code}",
# print("Downloading %s..." % full_url) ]
try: if not full_url.endswith(".gz"):
subprocess.check_call(curl_cmd) # stupid hack for stupid Apple behavior where it sometimes returns
except subprocess.CalledProcessError as err: # compressed files even when not asked for
raise ReplicationError(err) curl_cmd.append("--compressed")
resumed = False
if not ignore_cache and os.path.exists(local_file_path):
if not attempt_resume:
curl_cmd.extend(["-z", local_file_path])
else:
resumed = True
curl_cmd.extend(["-z", "-" + local_file_path, "-C", "-"])
curl_cmd.append(full_url)
# print("Downloading %s..." % full_url)
need_download = False
try:
_ = subprocess.check_output(curl_cmd)
except subprocess.CalledProcessError as err:
if not resumed or not err.output.isdigit():
raise ReplicationError(err)
# HTTP error 416 on resume: the download is already complete and the
# file is up-to-date
# HTTP error 412 on resume: the file was updated server-side
if int(err.output) == 412:
print("Removing %s and retrying." % local_file_path)
os.unlink(local_file_path)
need_download = True
elif int(err.output) != 416:
raise ReplicationError(err)
return local_file_path return local_file_path