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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-04-29 04:16:28 +02:00 • committed by GitHub
parent 64d405256d
commit 7df17285c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/install.sh
View file

@ -314,16 +314,16 @@ downloadImage() {
local iso="$1" local iso="$1"
local version="$2" local version="$2"
local url=""
local tried="n" local tried="n"
local rc desc local url desc
if [[ "${version,,}" == "http"* ]]; then if [[ "${version,,}" == "http"* ]]; then
url="$version"
desc=$(getName "$BASE" "$BASE") desc=$(getName "$BASE" "$BASE")
downloadFile "$iso" "$version" "$desc" && return 0
return 1
else fi
if ! validVersion "$version"; then if ! validVersion "$version"; then
error "Invalid VERSION value: $version" && return 1 error "Invalid VERSION value: $version" && return 1
@ -347,18 +347,12 @@ downloadImage() {
rm -rf "$TMP" rm -rf "$TMP"
mkdir -p "$TMP" mkdir -p "$TMP"
getESD "$TMP/esd" "$version" && url="$ESD_URL" if getESD "$TMP/esd" "$version"; then
downloadFile "$iso" "$ESD_URL" "$desc" && return 0
fi fi
fi fi
if [ -n "$url" ]; then
downloadFile "$iso" "$url" "$desc" && return 0
fi
[[ "${version,,}" == "http"* ]] && return 1
ISO="$TMP/$BASE" ISO="$TMP/$BASE"
iso="$ISO" iso="$ISO"