diff --git a/readme.md b/readme.md index 7f4fa38..b33a405 100644 --- a/readme.md +++ b/readme.md @@ -95,7 +95,7 @@ kubectl apply -f https://raw.githubusercontent.com/dockur/windows/refs/heads/mas |---|---|---| | `11` | Windows 11 Pro | 5.4 GB | | `11l` | Windows 11 LTSC | 4.7 GB | - | `11e` | Windows 11 Enterprise | 4.0 GB | + | `11e` | Windows 11 Enterprise | 5.3 GB | |||| | `10` | Windows 10 Pro | 5.7 GB | | `10l` | Windows 10 LTSC | 4.6 GB | diff --git a/src/define.sh b/src/define.sh index c82c8ca..4bc9730 100644 --- a/src/define.sh +++ b/src/define.sh @@ -734,8 +734,8 @@ getMido() { sum="b56b911bf18a2ceaeb3904d87e7c770bdf92d3099599d61ac2497b91bf190b11" ;; "win11x64-enterprise-eval" ) - size=4295096320 - sum="dad633276073f14f3e0373ef7e787569e216d54942ce522b39451c8f2d38ad43" + size=5387960320 + sum="755a90d43e826a74b9e1932a34788b898e028272439b777e5593dee8d53622ae" url="https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1.240331-1435.ge_release_CLIENTENTERPRISEEVAL_OEMRET_A64FRE_en-us.iso" ;; "win11x64-enterprise-iot-eval" | "win11x64-enterprise-ltsc-eval" ) @@ -1313,7 +1313,7 @@ isMido() { local lang="$2" local sum - [[ "${MIDO:-}" != [Yy1]* ]] && return 1 + [[ "${MIDO:-}" == [Nn]* ]] && return 1 sum=$(getMido "$id" "en" "sum") [ -n "$sum" ] && return 0 @@ -1326,7 +1326,7 @@ isESD() { local id="$1" local lang="$2" - [[ "${ESD:-}" != [Yy1]* ]] && return 1 + [[ "${ESD:-}" == [Nn]* ]] && return 1 case "${id,,}" in "win11${PLATFORM,,}" | "win10${PLATFORM,,}" ) diff --git a/src/mido.sh b/src/mido.sh index 9d4fcbb..c50fc89 100644 --- a/src/mido.sh +++ b/src/mido.sh @@ -264,19 +264,17 @@ download_windows_eval() { } case "$enterprise_type" in - "iot" ) - "ltsc" ) - "enterprise" ) - if [[ "${PLATFORM,,}" == "x64" ]]; then - iso_download_link=$(echo "$iso_download_links" | head -n 1) - fi - if [[ "${PLATFORM,,}" == "arm64" ]]; then - iso_download_link=$(echo "$iso_download_links" | head -n 2 | tail -n 1) - fi - ;; + "iot" | "ltsc" | "enterprise" ) + case "${PLATFORM,,}" in + "x64" ) + iso_download_link=$(echo "$iso_download_links" | head -n 1) ;; + "arm64" ) + iso_download_link=$(echo "$iso_download_links" | head -n 2 | tail -n 1) ;; + * ) + error "Invalid platform specified, value \"$PLATFORM\" is not recognized!" && return 1 ;; + esac ;; "server" ) - iso_download_link=$(echo "$iso_download_links" | head -n 1) - ;; + iso_download_link=$(echo "$iso_download_links" | head -n 1) ;; * ) error "Invalid type specified, value \"$enterprise_type\" is not recognized!" && return 1 ;; esac @@ -581,6 +579,7 @@ downloadFile() { fi info "$msg..." + [[ "$DEBUG" == [Yy1]* ]] && echo "Downloading $url" { wget "$url" -O "$iso" -q --timeout=30 --no-http-keep-alive --user-agent "$agent" --show-progress "$progress"; rc=$?; } || :