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

fix: Skip ESD errors

Browse source
This commit is contained in:
Kroese 2024-04-24 17:56:20 +02:00 • committed by GitHub
parent 94c4163851
commit 17a1303234
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 40 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/install.sh
View file

@ -2,8 +2,10 @@
set -Eeuo pipefail
: "${MANUAL:=""}"
: "${VERSION:=""}"
: "${DETECTED:=""}"
: "${VERSION:="win11x64"}"
[ -z "$VERSION" ] && VERSION="win11x64"
if [[ "${VERSION}" == \"*\" || "${VERSION}" == \'*\' ]]; then
VERSION="${VERSION:1:-1}"
@ -451,14 +453,20 @@ downloadImage() {
local iso="$1"
local url="$2"
local file="$iso"
local desc rc progress
local rc=99
local msg desc progress
rm -f "$iso"
# Check if running with interactive TTY or redirected to docker log
if [ -t 1 ]; then
progress="--progress=bar:noscroll"
else
progress="--progress=dot:giga"
fi
if [[ "$EXTERNAL" != [Yy1]* ]]; then
file="$iso.PART"
desc=$(printVersion "$VERSION" "Windows")
else
@ -467,12 +475,12 @@ downloadImage() {
fi
local msg="Downloading $desc..."
info "$msg" && html "$msg"
/run/progress.sh "$file" "Downloading $desc ([P])..." &
if [[ "$EXTERNAL" != [Yy1]* ]]; then
msg="Downloading $desc..."
info "$msg" && html "$msg"
/run/progress.sh "$iso.PART" "Downloading $desc ([P])..." &
cd "$TMP"
{ /run/mido.sh "$url"; rc=$?; } || :
cd /run
@ -486,7 +494,7 @@ downloadImage() {
fi
if [[ "$VERSION" != "win10x64" ]] && [[ "$VERSION" != "win11x64" ]]; then
error "Failed to download $desc" && return 1
return 1
fi
info "Failed to download $desc using Mido, will try a different method now..."
@ -499,24 +507,21 @@ downloadImage() {
iso="$ISO"
rm -f "$iso"
if ! getESD "$TMP/esd" "$iso"; then
return 1
url=""
rc=99
if getESD "$TMP/esd" "$iso"; then
url="$ESD_URL"
fi
url="$ESD_URL"
fi
if [ -n "$url" ]; then
msg="Downloading $desc..."
info "$msg" && html "$msg"
/run/progress.sh "$iso" "Downloading $desc ([P])..." &
fi
# Check if running with interactive TTY or redirected to docker log
if [ -t 1 ]; then
progress="--progress=bar:noscroll"
else
progress="--progress=dot:giga"
fi
{ wget "$url" -O "$iso" -q --no-check-certificate --show-progress "$progress"; rc=$?; } || :
fKill "progress.sh"
@ -527,17 +532,20 @@ downloadImage() {
fi
fi
fi
if [[ "$EXTERNAL" != [Yy1]* ]]; then
case "${VERSION,,}" in
"win11${ARCHI,,}")
url="https://dl.bobpony.com/windows/11/en-us_windows_11_23h2_x64.iso"
url="https://dl.bobpony.com/windows/11/en-us_windows_11_23h2_${ARCHI}.iso"
;;
"win10${ARCHI,,}")
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_${ARCHI}.iso"
;;
*)
error "Failed to download $url , reason: $rc" && return 1
(( rc != 99 )) && error "Failed to download $url , reason: $rc"
return 1
;;
esac
@ -567,7 +575,8 @@ downloadImage() {
fi
error "Failed to download $url , reason: $rc" && return 1
(( rc != 99 )) && error "Failed to download $url , reason: $rc"
return 1
}
extractESD() {