fix: Download message

This commit is contained in:
Kroese 2024-04-24 16:41:05 +02:00 committed by GitHub
parent 949608d5c8
commit c34f7dcfd3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -518,9 +518,8 @@ downloadImage() {
{ wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || : { wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || :
fKill "progress.sh" fKill "progress.sh"
(( rc != 0 )) && error "Failed to download $url , reason: $rc" && return 1
if [ -f "$iso" ]; then if (( rc == 0 )) && [ -f "$iso" ]; then
if [ $(stat -c%s "$iso") -gt 100000000 ]; then if [ $(stat -c%s "$iso") -gt 100000000 ]; then
html "Download finished successfully..." && return 0 html "Download finished successfully..." && return 0
fi fi
@ -536,7 +535,7 @@ downloadImage() {
url="https://dl.bobpony.com/windows/10/en-us_windows_10_22h2_x64.iso" url="https://dl.bobpony.com/windows/10/en-us_windows_10_22h2_x64.iso"
;; ;;
*) *)
error "Failed to download $url" && return 1 error "Failed to download $url , reason: $rc" && return 1
;; ;;
esac esac
@ -557,16 +556,16 @@ downloadImage() {
{ wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || : { wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || :
fKill "progress.sh" fKill "progress.sh"
(( rc != 0 )) && error "Failed to download $url , reason: $rc" && return 1
if [ -f "$iso" ]; then if (( rc == 0 )) && [ -f "$iso" ]; then
if [ $(stat -c%s "$iso") -gt 100000000 ]; then if [ $(stat -c%s "$iso") -gt 100000000 ]; then
html "Download finished successfully..." && return 0 html "Download finished successfully..." && return 0
fi fi
fi fi
fi fi
error "Failed to download $url" && return 1 error "Failed to download $url , reason: $rc" && return 1
} }
extractESD() { extractESD() {