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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-04-29 03:34:01 +02:00 • committed by GitHub
parent 83dc97162d
commit 635c10580b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 41 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/install.sh
View file

@ -315,32 +315,35 @@ downloadImage() {
local iso="$1" local iso="$1"
local version="$2" local version="$2"
local url="" local url=""
local tried="n"
local rc desc local rc desc
if [[ "${version,,}" != "http"* ]]; then if [[ "${version,,}" == "http"* ]]; then
desc=$(printVersion "$version" "Windows")
else
url="$version" url="$version"
desc=$(getName "$BASE" "$BASE") desc=$(getName "$BASE" "$BASE")
fi else
if [ -z "$url" ]; then if ! validVersion "$version"; then
error "Invalid VERSION value: $version" && return 1
fi
desc=$(printVersion "$version" "Windows")
if isMido "$version"; then if isMido "$version"; then
tried="y"
doMido "$iso" "$version" "$desc" && return 0 doMido "$iso" "$version" "$desc" && return 0
fi fi
if isESD "$version"; then if isESD "$version"; then
info "Failed to download $desc using Mido, will try a different method now..." [[ "$tried" != "n" ]] && info "Failed to download $desc using Mido, will try a different method now..."
ISO="$TMP/$version.esd" ISO="$TMP/$version.esd"
iso="$ISO" iso="$ISO"
tried="y"
rm -rf "$TMP" rm -rf "$TMP"
mkdir -p "$TMP" mkdir -p "$TMP"
@ -356,22 +359,40 @@ downloadImage() {
[[ "${version,,}" == "http"* ]] && return 1 [[ "${version,,}" == "http"* ]] && return 1
url=$(getLink "$version")
if [ -z "$url" ]; then
! isMido "$version" && error "Invalid version specified: $version"
return 1
fi
isMido "$version" && info "Failed to download $desc from Microsoft, will try another mirror now..."
ISO="$TMP/$BASE" ISO="$TMP/$BASE"
iso="$ISO" iso="$ISO"
rm -rf "$TMP" url=$(getLink "$version")
mkdir -p "$TMP"
downloadFile "$iso" "$url" "$desc" && return 0 if [ -n "$url" ]; then
if [[ "$tried" != "n" ]]; then
info "Failed to download $desc from Microsoft, will try another mirror now..."
fi
tried="y"
rm -rf "$TMP"
mkdir -p "$TMP"
downloadFile "$iso" "$url" "$desc" && return 0
fi
url=$(secondLink "$version")
if [ -n "$url" ]; then
if [[ "$tried" != "n" ]]; then
info "Failed to download $desc, will try another mirror now..."
fi
tried="y"
rm -rf "$TMP"
mkdir -p "$TMP"
downloadFile "$iso" "$url" "$desc" && return 0
fi
return 1 return 1
} }