mirror of
https://github.com/dockur/windows.git
synced 2026-08-03 12:37:20 +01:00
feat: Do not retry download when validation fails (#1878)
This commit is contained in:
+23
-4
@@ -849,7 +849,10 @@ downloadFile() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
verifyFile "$iso" "$size" "$total" "$sum" || return 1
|
# Status 2 means the download completed but failed validation.
|
||||||
|
verifyFile "$iso" "$size" "$total" "$sum" || return 2
|
||||||
|
|
||||||
|
# Extract the .iso from the compressed archive if needed.
|
||||||
isCompressed "$url" && UNPACK="Y"
|
isCompressed "$url" && UNPACK="Y"
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
@@ -893,13 +896,29 @@ tryDownload() {
|
|||||||
local lang="$5"
|
local lang="$5"
|
||||||
local desc="$6"
|
local desc="$6"
|
||||||
local seconds="$7"
|
local seconds="$7"
|
||||||
|
local rc=0
|
||||||
|
|
||||||
rm -f "$iso"
|
rm -f "$iso"
|
||||||
downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0
|
|
||||||
|
if downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc"; then
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
rc=$?
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Do not download the same file again when its contents failed validation.
|
||||||
|
if (( rc == 2 )); then
|
||||||
|
rm -f "$iso"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
delay "$seconds"
|
delay "$seconds"
|
||||||
downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0
|
|
||||||
rm -f "$iso"
|
|
||||||
|
|
||||||
|
if downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc"; then
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f "$iso"
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user