prehistoric-systems/macos
1
0
Fork 0
mirror of https://github.com/dockur/macos.git synced 2026-03-11 08:34:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: macOS Sequoia download (#90)

Browse source
This commit is contained in:
Kroese 2024-10-04 18:02:06 +02:00 committed by GitHub
parent 0e69a19220
commit 1cf4f3d154
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/recovery.py → src/fetch.py
View file

@ -215,6 +215,7 @@ def save_image(url, sess, filename='', directory=''):
totalsize = int(headers[header])
break
size = 0
last = 0
while True:
chunk = response.read(2**20)
if not chunk:
@ -223,10 +224,15 @@ def save_image(url, sess, filename='', directory=''):
size += len(chunk)
if totalsize > 0:
progress = size / totalsize
print(f'\r{progress*100:.1f}% downloaded', end='')
if (progress - last) >= 0.01 or progress >= 1:
last = progress
print(f'\r{progress*100:.1f}% downloaded', end='')
else:
# Fallback if Content-Length isn't available
print(f'\r{size / (2**20)} MB downloaded...', end='')
progress = size / (2**20)
if (progress - last) >= 10:
last = progress
print(f'\r{progress} MB downloaded...', end='')
sys.stdout.flush()
print('\nDownload complete!')
@ -237,8 +243,11 @@ def verify_image(dmgpath, cnkpath):
print('Verifying image with chunklist...')
with open(dmgpath, 'rb') as dmgf:
last=0
for cnkcount, (cnksize, cnkhash) in enumerate(verify_chunklist(cnkpath), 1):
print(f'\rChunk {cnkcount} ({cnksize} bytes)', end='')
if (cnkcount - last) >= 10:
last = cnkcount
print(f'\rChunk {cnkcount} ({cnksize} bytes)', end='')
sys.stdout.flush()
cnk = dmgf.read(cnksize)
if len(cnk) != cnksize:

2
src/install.sh
View file

@ -42,7 +42,7 @@ downloadImage() {
/run/progress.sh "$path" "" "$msg ([P])..." &
if ! /run/recovery.py -b "$board" -n "$file" -o "$TMP" download; then
if ! /run/fetch.py -b "$board" -n "$file" -os latest -o "$TMP" download; then
error "Failed to fetch macOS \"${version^}\" recovery image with board id \"$board\"!"
fKill "progress.sh"
return 1