sebarocks/docker-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2025-10-29 12:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-05-06 04:20:05 +02:00 • committed by GitHub
parent dbaeea0381
commit abb58675e3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/install.sh
View file

@ -626,13 +626,14 @@ selectVersion() {
local tag="$1" local tag="$1"
local xml="$2" local xml="$2"
local platform="$3"
local id find name prefer local id find name prefer
name=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml") name=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml")
[[ "$name" == *"Operating System"* ]] && name="" [[ "$name" == *"Operating System"* ]] && name=""
[ -z "$name" ] && return 0 [ -z "$name" ] && return 0
id=$(fromName "$name") id=$(fromName "$name" "$platform")
[ -z "$id" ] && warn "Unknown ${tag,,}: '$name'" && return 0 [ -z "$id" ] && warn "Unknown ${tag,,}: '$name'" && return 0
prefer="$id-enterprise" prefer="$id-enterprise"
@ -653,7 +654,7 @@ selectVersion() {
echo "$prefer" && return 0 echo "$prefer" && return 0
fi fi
prefer=$(getVersion "$name") prefer=$(getVersion "$name" "$platform")
echo "$prefer" echo "$prefer"
return 0 return 0
@ -663,14 +664,25 @@ detectVersion() {
local xml="$1" local xml="$1"
local id="" local id=""
local arch=""
local tag="ARCH"
local platform="x64"
id=$(selectVersion "DISPLAYNAME" "$xml") arch=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml")
case "${arch,,}" in
"0" ) platform="x86" ;;
"9" ) platform="x64" ;;
"12" ) platform="arm64" ;;
esac
id=$(selectVersion "DISPLAYNAME" "$xml" "$platform")
[ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0 [ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0
id=$(selectVersion "PRODUCTNAME" "$xml") id=$(selectVersion "PRODUCTNAME" "$xml" "$platform")
[ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0 [ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0
id=$(selectVersion "NAME" "$xml") id=$(selectVersion "NAME" "$xml" "$platform")
[ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0 [ -n "$id" ] && [[ "${id,,}" != *"unknown"* ]] && echo "$id" && return 0
return 0 return 0