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

Update mido.sh

Browse source
This commit is contained in:
Kroese 2024-05-17 19:53:37 +02:00 • committed by GitHub
parent 246acb012e
commit e576fc5a92
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/mido.sh
View file

@ -456,7 +456,8 @@ downloadFile() {
local url="$2" local url="$2"
local sum="$3" local sum="$3"
local size="$4" local size="$4"
local desc="$5" local lang="$5"
local desc="$6"
local rc total progress domain dots local rc total progress domain dots
rm -f "$iso" rm -f "$iso"
@ -510,35 +511,39 @@ downloadImage() {
local iso="$1" local iso="$1"
local version="$2" local version="$2"
local language="$3" local lang="$3"
local tried="n" local tried="n"
local url sum size base desc local url sum size base desc
if [[ "${version,,}" == "http"* ]]; then if [[ "${version,,}" == "http"* ]]; then
base=$(basename "$iso") base=$(basename "$iso")
desc=$(fromFile "$base") desc=$(fromFile "$base")
downloadFile "$iso" "$version" "" "" "$desc" && return 0 downloadFile "$iso" "$version" "" "" "" "$desc" && return 0
return 1 return 1
fi fi
if ! validVersion "$version" "$language"; then if ! validVersion "$version" "$lang"; then
error "Invalid VERSION specified, value \"$version\" is not recognized!" && return 1 error "Invalid VERSION specified, value \"$version\" is not recognized!" && return 1
fi fi
desc=$(printVersion "$version" "") desc=$(printVersion "$version" "")
if isMido "$version" "$language"; then if [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-"* ]]; then
desc="$desc ($lang)"
fi
if isMido "$version" "$lang"; then
tried="y" tried="y"
if getWindows "$version" "$language" "$desc"; then if getWindows "$version" "$lang" "$desc"; then
size=$(getMido "$version" "$language" "size" ) size=$(getMido "$version" "$lang" "size" )
sum=$(getMido "$version" "$language" "sum") sum=$(getMido "$version" "$lang" "sum")
downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$desc" && return 0 downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0
fi fi
fi fi
switchEdition "$version" switchEdition "$version"
if isESD "$version" "$language"; then if isESD "$version" "$lang"; then
if [[ "$tried" != "n" ]]; then if [[ "$tried" != "n" ]]; then
info "Failed to download $desc, will try a diferent method now..." info "Failed to download $desc, will try a diferent method now..."
@ -546,9 +551,9 @@ downloadImage() {
tried="y" tried="y"
if getESD "$TMP/esd" "$version" "$language" "$desc"; then if getESD "$TMP/esd" "$version" "$lang" "$desc"; then
ISO="${ISO%.*}.esd" ISO="${ISO%.*}.esd"
downloadFile "$ISO" "$ESD" "$ESD_SUM" "$ESD_SIZE" "$desc" && return 0 downloadFile "$ISO" "$ESD" "$ESD_SUM" "$ESD_SIZE" "$lang" "$desc" && return 0
ISO="$iso" ISO="$iso"
fi fi
@ -556,16 +561,16 @@ downloadImage() {
for ((i=1;i<=MIRRORS;i++)); do for ((i=1;i<=MIRRORS;i++)); do
url=$(getLink "$i" "$version" "$language") url=$(getLink "$i" "$version" "$lang")
if [ -n "$url" ]; then if [ -n "$url" ]; then
if [[ "$tried" != "n" ]]; then if [[ "$tried" != "n" ]]; then
info "Failed to download $desc, will try another mirror now..." info "Failed to download $desc, will try another mirror now..."
fi fi
tried="y" tried="y"
size=$(getSize "$i" "$version" "$language") size=$(getSize "$i" "$version" "$lang")
sum=$(getHash "$i" "$version" "$language") sum=$(getHash "$i" "$version" "$lang")
downloadFile "$iso" "$url" "$sum" "$size" "$desc" && return 0 downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0
fi fi
done done