diff --git a/src/define.sh b/src/define.sh index 98a63c1..1be1d9e 100644 --- a/src/define.sh +++ b/src/define.sh @@ -59,7 +59,7 @@ parseVersion() { VERSION="win81x64" ;; "8e" | "81e" | "8.1e" | "win8e" | "win81e" | "windows 8e" ) - VERSION="win81x64-enterprise-eval" + VERSION="win81x64-enterprise" ;; "7" | "7e" | "win7" | "win7e" | "windows7" | "windows 7" ) VERSION="win7x64" @@ -665,9 +665,6 @@ switchEdition() { "win10${PLATFORM,,}-enterprise-eval" ) DETECTED="win10${PLATFORM,,}-enterprise" ;; - "win81${PLATFORM,,}-enterprise-eval" ) - DETECTED="win81${PLATFORM,,}-enterprise" - ;; "win2025-eval" ) DETECTED="win2025" ;; "win2022-eval" ) DETECTED="win2022" ;; "win2019-eval" ) DETECTED="win2019" ;; @@ -718,10 +715,6 @@ getMido() { size=4898582528 sum="e4ab2e3535be5748252a8d5d57539a6e59be8d6726345ee10e7afd2cb89fefb5" ;; - "win81x64-enterprise-eval" ) - size=3961473024 - sum="2dedd44c45646c74efc5a028f65336027e14a56f76686a4631cf94ffe37c72f2" - ;; "win2025-eval" ) size=5307996160 sum="16442d1c0509bcbb25b715b1b322a15fb3ab724a42da0f384b9406ca1c124ed4" @@ -742,10 +735,6 @@ getMido() { size=4542291968 sum="6612b5b1f53e845aacdf96e974bb119a3d9b4dcb5b82e65804ab7e534dc7b4d5" ;; - "win2008r2" ) - size=3166840832 - sum="30832ad76ccfa4ce48ccb936edefe02079d42fb1da32201bf9e3a880c8ed6312" - ;; esac case "${ret,,}" in diff --git a/src/install.sh b/src/install.sh index 953653e..2a322be 100644 --- a/src/install.sh +++ b/src/install.sh @@ -1006,10 +1006,10 @@ bootWindows() { if [ -s "$STORAGE/windows.mode" ] && [ -f "$STORAGE/windows.mode" ]; then BOOT_MODE=$(<"$STORAGE/windows.mode") - if [ -s "$STORAGE/windows.old" ] && [ -f "$STORAGE/windows.old" ]; then - [[ "${PLATFORM,,}" == "x64" ]] && MACHINE=$(<"$STORAGE/windows.old") - fi - return 0 + fi + + if [ -s "$STORAGE/windows.old" ] && [ -f "$STORAGE/windows.old" ]; then + [[ "${PLATFORM,,}" == "x64" ]] && MACHINE=$(<"$STORAGE/windows.old") fi return 0 diff --git a/src/mido.sh b/src/mido.sh index 4f81618..19d1257 100644 --- a/src/mido.sh +++ b/src/mido.sh @@ -310,7 +310,7 @@ getWindows() { info "$msg" && html "$msg" case "${version,,}" in - "win2008r2" | "win81${PLATFORM,,}-enterprise"* | "win11${PLATFORM,,}-enterprise-iot"* | "win11${PLATFORM,,}-enterprise-ltsc"* ) + "win11${PLATFORM,,}-enterprise-iot"* | "win11${PLATFORM,,}-enterprise-ltsc"* ) if [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-"* ]]; then error "No download in the $language language available for $edition!" MIDO_URL="" && return 1 @@ -338,56 +338,9 @@ getWindows() { "win2025-eval" | "win2022-eval" | "win2019-eval" | "win2016-eval" | "win2012r2-eval" ) download_windows_eval "$version" "$lang" "$edition" && return 0 ;; - "win81${PLATFORM,,}-enterprise"* | "win2008r2" ) - ;; * ) error "Invalid VERSION specified, value \"$version\" is not recognized!" ;; esac - if [[ "${PLATFORM,,}" != "x64" ]]; then - MIDO_URL="" - return 1 - fi - - if [[ "${lang,,}" != "en" ]] && [[ "${lang,,}" != "en-"* ]]; then - MIDO_URL="" - return 1 - fi - - case "${version,,}" in - "win81${PLATFORM,,}-enterprise"* ) - MIDO_URL="https://download.microsoft.com/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO" - return 0 - ;; - "win11${PLATFORM,,}-enterprise-iot"* | "win11${PLATFORM,,}-enterprise-ltsc"* ) - MIDO_URL="https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1.240331-1435.ge_release_CLIENT_IOT_LTSC_EVAL_x64FRE_en-us.iso" - return 0 - ;; - "win2025-eval" ) - MIDO_URL="https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1.240331-1435.ge_release_SERVER_EVAL_x64FRE_en-us.iso" - return 0 - ;; - "win2022-eval" ) - MIDO_URL="https://software-static.download.prss.microsoft.com/sg/download/888969d5-f34g-4e03-ac9d-1f9786c66749/SERVER_EVAL_x64FRE_en-us.iso" - return 0 - ;; - "win2019-eval" ) - MIDO_URL="https://software-download.microsoft.com/download/pr/17763.737.190906-2324.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us_1.iso" - return 0 - ;; - "win2016-eval" ) - MIDO_URL="https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO" - return 0 - ;; - "win2012r2-eval" ) - MIDO_URL="https://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO" - return 0 - ;; - "win2008r2" ) - MIDO_URL="https://download.microsoft.com/download/4/1/D/41DEA7E0-B30D-4012-A1E3-F24DC03BA1BB/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso" - return 0 - ;; - esac - MIDO_URL="" return 1 }