diff --git a/src/define.sh b/src/define.sh index 0215b4e..c1590b7 100644 --- a/src/define.sh +++ b/src/define.sh @@ -78,84 +78,6 @@ parseVersion() { return 0 } -isESD() { - - local id="$1" - - case "${id,,}" in - "win11${PLATFORM,,}") - return 0 - ;; - "win10${PLATFORM,,}") - return 0 - ;; - esac - - return 1 -} - -isMido() { - - local id="$1" - - case "${id,,}" in - "win11${PLATFORM,,}" | "win11${PLATFORM,,}-enterprise-eval") - return 0 - ;; - "win10${PLATFORM,,}" | "win10${PLATFORM,,}-enterprise-eval" | "win10${PLATFORM,,}-enterprise-ltsc-eval") - return 0 - ;; - "win81${PLATFORM,,}" | "win81${PLATFORM,,}-enterprise-eval") - return 0 - ;; - "win2022-eval" | "win2019-eval" | "win2016-eval" | "win2012r2-eval" | "win2008r2") - return 0 - ;; - esac - - return 1 -} - -validVersion() { - - local id="$1" - - isESD "$id" && return 0 - isMido "$id" && return 0 - - case "${id,,}" in - "win11${PLATFORM,,}" | "win11${PLATFORM,,}-enterprise" | "win11${PLATFORM,,}-enterprise-eval") - return 0 - ;; - "win10${PLATFORM,,}" | "win10${PLATFORM,,}-enterprise" | "win10${PLATFORM,,}-enterprise-eval") - return 0 - ;; - "win10${PLATFORM,,}-enterprise-iot-eval" | "win10${PLATFORM,,}-enterprise-ltsc-eval") - return 0 - ;; - "win81${PLATFORM,,}" | "win81${PLATFORM,,}-enterprise" | "win81${PLATFORM,,}-enterprise-eval") - return 0 - ;; - "win2022-eval" | "win2019-eval" | "win2016-eval" | "win2012r2-eval" | "win2008r2") - return 0 - ;; - "win7${PLATFORM,,}" | "win7${PLATFORM,,}-enterprise") - return 0 - ;; - "winvista${PLATFORM,,}" | "winvista${PLATFORM,,}-ultimate") - return 0 - ;; - "winxpx86") - return 0 - ;; - "core11" | "tiny11" | "tiny10") - return 0 - ;; - esac - - return 1 -} - printVersion() { local id="$1" @@ -371,6 +293,44 @@ switchEdition() { return 0 } +isESD() { + + local id="$1" + + case "${id,,}" in + "win11${PLATFORM,,}") + return 0 + ;; + "win10${PLATFORM,,}") + return 0 + ;; + esac + + return 1 +} + +isMido() { + + local id="$1" + + case "${id,,}" in + "win11${PLATFORM,,}" | "win11${PLATFORM,,}-enterprise-eval") + return 0 + ;; + "win10${PLATFORM,,}" | "win10${PLATFORM,,}-enterprise-eval" | "win10${PLATFORM,,}-enterprise-ltsc-eval") + return 0 + ;; + "win81${PLATFORM,,}" | "win81${PLATFORM,,}-enterprise-eval") + return 0 + ;; + "win2022-eval" | "win2019-eval" | "win2016-eval" | "win2012r2-eval" | "win2008r2") + return 0 + ;; + esac + + return 1 +} + getLink() { # Fallbacks for users who cannot connect to the Microsoft servers @@ -509,6 +469,22 @@ secondLink() { return 0 } +validVersion() { + + local id="$1" + + isESD "$id" && return 0 + isMido "$id" && return 0 + + local url=$(getLink "$id") + [ -n "$url" ] && return 0 + + local url=$(secondLink "$id") + [ -n "$url" ] && return 0 + + return 1 +} + migrateFiles() { local base="$1"