From 425a661c93fa34218d90a5012c628f4c46e688dd Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 21 Sep 2025 23:11:56 +0200 Subject: [PATCH 1/3] revert: Simplify conditional checks --- src/mido.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mido.sh b/src/mido.sh index 49bc732..4c01efc 100644 --- a/src/mido.sh +++ b/src/mido.sh @@ -452,7 +452,7 @@ getESD() { winCatalog=$(getCatalog "$version" "url") editionName=$(getCatalog "$version" "edition") - if [ -z "$file" || -z "$winCatalog" || -z "$editionName" ]; then + if [ -z "$file" ] || [ -z "$winCatalog" ] || [ -z "$editionName" ]; then error "Invalid VERSION specified, value \"$version\" is not recognized!" && return 1 fi From 6470d19bc7c2fabf3c9bfb9f40be77b50b4d9107 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 21 Sep 2025 23:15:06 +0200 Subject: [PATCH 2/3] fix: Formatting issues --- src/define.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/define.sh b/src/define.sh index 31df027..62a6f9e 100644 --- a/src/define.sh +++ b/src/define.sh @@ -436,7 +436,7 @@ printVersion() { "tiny11"* ) desc="Tiny 11" ;; "tiny10"* ) desc="Tiny 10" ;; "core11"* ) desc="Core 11" ;; - "nano11"* ) desc="Nano 11" ;; + "nano11"* ) desc="Nano 11" ;; "win7"* ) desc="Windows 7" ;; "win8"* ) desc="Windows 8" ;; "win10"* ) desc="Windows 10" ;; @@ -577,7 +577,7 @@ fromFile() { ;; "nano11"* | "nano_11"* ) id="nano11" - ;; + ;; "tiny11core"* | "tiny11_core"* | "tiny_11_core"* ) id="core11" ;; From 8471d296eab133a4ead3c881ec1ca747e94e1d14 Mon Sep 17 00:00:00 2001 From: Kroese Date: Sun, 21 Sep 2025 23:22:12 +0200 Subject: [PATCH 3/3] fix: Formatting issues --- src/mido.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/mido.sh b/src/mido.sh index 4c01efc..c84b28b 100644 --- a/src/mido.sh +++ b/src/mido.sh @@ -372,7 +372,7 @@ getCatalog() { local name="" local edition="" local file="catalog.cab" - + case "${id,,}" in "win11${PLATFORM,,}" ) edition="Professional" @@ -411,7 +411,7 @@ getOldCatalog() { local name="" local edition="" local file="catalog.xml" - + case "${id,,}" in "win11${PLATFORM,,}" ) edition="Professional" @@ -456,7 +456,7 @@ getESD() { error "Invalid VERSION specified, value \"$version\" is not recognized!" && return 1 fi - local msg="Downloading product information from Microsoft server..." + local msg="Downloading product information..." info "$msg" && html "$msg" rm -rf "$dir" @@ -680,7 +680,7 @@ downloadImage() { base=$(basename "$iso") desc=$(fromFile "$base") - rm -f "$iso" + rm -f "$iso" downloadFile "$iso" "$version" "" "" "" "$desc" && return 0 info "$msg" && html "$msg" && sleep "$delay" downloadFile "$iso" "$version" "" "" "" "$desc" && return 0 @@ -720,7 +720,7 @@ downloadImage() { size=$(getMido "$version" "$lang" "size" ) sum=$(getMido "$version" "$lang" "sum") - rm -f "$iso" + rm -f "$iso" downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0 info "$msg" && html "$msg" && sleep "$delay" downloadFile "$iso" "$MIDO_URL" "$sum" "$size" "$lang" "$desc" && return 0 @@ -768,12 +768,12 @@ downloadImage() { if [[ "$tried" != "n" ]]; then info "Failed to download $desc, will try another mirror now..." fi - + tried="y" size=$(getSize "$i" "$version" "$lang") sum=$(getHash "$i" "$version" "$lang") - rm -f "$iso" + rm -f "$iso" downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0 info "$msg" && html "$msg" && sleep "$delay" downloadFile "$iso" "$url" "$sum" "$size" "$lang" "$desc" && return 0