diff --git a/src/define.sh b/src/define.sh index 31ce66fc..69f440be 100644 --- a/src/define.sh +++ b/src/define.sh @@ -50,49 +50,41 @@ parseVersion() { "11e" | "win11e" | "windows11e" | "windows 11e" ) VERSION="win11x64-enterprise-eval" ;; "11l" | "11ltsc" | "ltsc11" | "win11l" | "win11-ltsc" | "win11x64-ltsc" ) - VERSION="win11x64-enterprise-ltsc-eval" - DETECTED="win11x64-ltsc" ;; + VERSION="win11x64-enterprise-ltsc-eval" ;; "11i" | "11iot" | "iot11" | "win11i" | "win11-iot" | "win11x64-iot" ) - VERSION="win11x64-enterprise-iot-eval" - DETECTED="win11x64-iot" ;; + VERSION="win11x64-enterprise-iot-eval" ;; "10" | "10p" | "win10" | "pro10" | "win10p" | "windows10" | "windows 10" ) VERSION="win10x64" ;; "10e" | "win10e" | "windows10e" | "windows 10e" ) VERSION="win10x64-enterprise-eval" ;; "10l" | "10ltsc" | "ltsc10" | "win10l" | "win10-ltsc" | "win10x64-ltsc" ) - VERSION="win10x64-enterprise-ltsc-eval" - DETECTED="win10x64-ltsc" ;; + VERSION="win10x64-enterprise-ltsc-eval" ;; "10i" | "10iot" | "iot10" | "win10i" | "win10-iot" | "win10x64-iot" ) - VERSION="win10x64-enterprise-iot-eval" - DETECTED="win10x64-iot" ;; + VERSION="win10x64-enterprise-iot-eval" ;; "8" | "8p" | "81" | "81p" | "pro8" | "8.1" | "win8" | "win8p" | "win81" | "win81p" | "windows 8" ) VERSION="win81x64" ;; "8e" | "81e" | "8.1e" | "win8e" | "win81e" | "windows 8e" ) VERSION="win81x64-enterprise-eval" ;; "7" | "win7" | "windows7" | "windows 7" ) - VERSION="win7x64" - DETECTED="win7x64-ultimate" ;; + VERSION="win7x64" ;; "7u" | "win7u" | "windows7u" | "windows 7u" ) VERSION="win7x64-ultimate" ;; "7e" | "win7e" | "windows7e" | "windows 7e" ) VERSION="win7x64-enterprise" ;; "7x86" | "win7x86" | "win732" | "windows7x86" ) - VERSION="win7x86" - DETECTED="win7x86-ultimate" ;; + VERSION="win7x86" ;; "7ux86" | "7u32" | "win7x86-ultimate" ) VERSION="win7x86-ultimate" ;; "7ex86" | "7e32" | "win7x86-enterprise" ) VERSION="win7x86-enterprise" ;; "vista" | "vs" | "6" | "winvista" | "windowsvista" | "windows vista" ) - VERSION="winvistax64" - DETECTED="winvistax64-ultimate" ;; + VERSION="winvistax64" ;; "vistu" | "vu" | "6u" | "winvistu" ) VERSION="winvistax64-ultimate" ;; "viste" | "ve" | "6e" | "winviste" ) VERSION="winvistax64-enterprise" ;; "vistax86" | "vista32" | "6x86" | "winvistax86" | "windowsvistax86" ) - VERSION="winvistax86" - DETECTED="winvistax86-ultimate" ;; + VERSION="winvistax86" ;; "vux86" | "vu32" | "winvistax86-ultimate" ) VERSION="winvistax86-ultimate" ;; "vex86" | "ve32" | "winvistax86-enterprise" ) diff --git a/src/install.sh b/src/install.sh index d0df1b04..e08549b6 100644 --- a/src/install.sh +++ b/src/install.sh @@ -51,6 +51,9 @@ selectWindowsImage() { DETECTED="$VERSION" fi + DETECTED="${DETECTED/-enterprise-iot/-iot}" + DETECTED="${DETECTED/-enterprise-ltsc/-ltsc}" + if [ -n "$DETECTED" ]; then if ! setImage; then