sebarocks/docker-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-10-28 11:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: Show download progress

Browse source
This commit is contained in:
Kroese 2024-01-29 04:12:04 +01:00 • committed by GitHub
parent 8207169089
commit 15899d0453
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/install.sh
View file

@ -211,7 +211,7 @@ startInstall() {
desc=$(printVersion "$VERSION") desc=$(printVersion "$VERSION")
[ -z "$desc" ] && desc="Windows" [ -z "$desc" ] && desc="Windows"
msg="$desc is being downloaded, please wait..." msg="Downloading $desc..."
fi fi
else else
@ -221,7 +221,7 @@ startInstall() {
BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g') BASE=$(echo "$BASE" | sed -e 's/[^A-Za-z0-9._-]/_/g')
if ! skipInstall && [ ! -f "$STORAGE/$BASE" ]; then if ! skipInstall && [ ! -f "$STORAGE/$BASE" ]; then
msg="Image '$BASE' is being downloaded, please wait..." msg="Downloading $BASE ..."
fi fi
fi fi
@ -277,22 +277,35 @@ downloadImage() {
local iso="$1" local iso="$1"
local url="$2" local url="$2"
local progress local msg desc progress
local finish="Download finished successfully..."
rm -f "$iso" rm -f "$iso"
if [[ "$EXTERNAL" != [Yy1]* ]]; then if [[ "$EXTERNAL" != [Yy1]* ]]; then
desc=$(printVersion "$VERSION")
[ -z "$desc" ] && desc="Windows"
msg="Downloading $desc..."
info "$msg" && html "$msg"
/run/progress.sh "$iso.PART" "Downloading $desc ([P])..." &
cd "$TMP" cd "$TMP"
if ! /run/mido.sh "$url"; then if ! /run/mido.sh "$url"; then
fKill "progress.sh"
return 1 return 1
fi fi
cd /run cd /run
fKill "progress.sh"
[ ! -f "$iso" ] && return 1 [ ! -f "$iso" ] && return 1
html "$finish"
return 0 return 0
fi fi
info "Downloading $BASE as boot image..." msg="Downloading $BASE ..."
info "$msg" && html "$msg"
# Check if running with interactive TTY or redirected to docker log # Check if running with interactive TTY or redirected to docker log
if [ -t 1 ]; then if [ -t 1 ]; then
@ -301,10 +314,14 @@ downloadImage() {
progress="--progress=dot:giga" progress="--progress=dot:giga"
fi fi
/run/progress.sh "$iso" "Downloading $BASE ([P])..." &
{ wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || : { wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || :
(( rc != 0 )) && error "Failed to download $url , reason: $rc" && exit 60
fKill "progress.sh"
(( rc != 0 )) && error "Failed to download $url , reason: $rc" && exit 60
[ ! -f "$iso" ] && return 1 [ ! -f "$iso" ] && return 1
html "$finish"
return 0 return 0
} }