Update define.sh

This commit is contained in:
Kroese 2024-05-06 04:37:05 +02:00 committed by GitHub
parent e59a573c10
commit fd324f2b9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -62,10 +62,7 @@ printEdition() {
[[ "$result" == "x" ]] && echo "$desc" && return 0
case "${id,,}" in
"win10"* )
edition="Pro"
;;
"win11"* )
"win10"* | "win11"* )
edition="Pro"
;;
esac
@ -81,13 +78,26 @@ fromFile() {
local id=""
local desc="$1"
local file="${1,,}"
local arch="${PLATFORM,,}"
case "${file/ /_}" in
*"_x64_"* | *"_x64."*)
arch="x64"
;;
*"_x86_"* | *"_x86."*)
arch="x86"
;;
*"_arm64_"* | *"_arm64."*)
arch="arm64"
;;
esac
case "${file/ /_}" in
"win10"*| "win_10"* | *"windows10"* | *"windows_10"* )
id="win10${PLATFORM,,}"
id="win10${arch}"
;;
"win11"* | "win_11"* | *"windows11"* | *"windows_11"* )
id="win11${PLATFORM,,}"
id="win11${arch}"
;;
esac
@ -103,10 +113,11 @@ fromName() {
local id=""
local name="$1"
local arch="$2"
case "${name,,}" in
*"windows 10"* ) id="win10${PLATFORM,,}" ;;
*"windows 11"* ) id="win11${PLATFORM,,}" ;;
*"windows 10"* ) id="win10${arch}" ;;
*"windows 11"* ) id="win11${arch}" ;;
esac
echo "$id"
@ -117,8 +128,9 @@ getVersion() {
local id
local name="$1"
local arch="$2"
id=$(fromName "$name")
id=$(fromName "$arch")
echo "$id"
return 0