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

Update install.sh

Browse source
This commit is contained in:
Kroese 2024-05-03 14:05:32 +02:00 • committed by GitHub
parent da861b3467
commit 9102e41ca9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 50 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/install.sh
View file

@ -563,35 +563,58 @@ setXML() {
return 1 return 1
} }
selectVersion() {
local tag="$1"
local xml="$2"
local id find name prefer
name=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml")
[[ "$name" == *"Operating System"* ]] && name=""
[ -z "$name" ] && return 0
id=$(fromName "$name")
[ -z "$id" ] && info "Unknown ${tag,,}: '$name'" && return 0
prefer="$id-enterprise"
find=$(printEdition "$prefer" "")
if [ -n "$find" ] && [[ "${xml,,}" == *"<${TAG,,}>${find,,}</${TAG,,}>"* ]]; then
echo "$prefer" && return 0
fi
prefer="$id-ultimate"
find=$(printEdition "$prefer" "")
if [ -n "$find" ] && [[ "${xml,,}" == *"<${TAG,,}>${find,,}</${TAG,,}>"* ]]; then
echo "$prefer" && return 0
fi
prefer="$id"
find=$(printEdition "$prefer" "")
if [ -n "$find" ] && [[ "${xml,,}" == *"<${TAG,,}>${find,,}</${TAG,,}>"* ]]; then
echo "$prefer" && return 0
fi
prefer=$(getVersion "$name")
echo "$prefer"
return 0
}
detectVersion() { detectVersion() {
local xml="$1" local xml="$1"
local name name2 name3 local id=""
local tag="DISPLAYNAME" id=$(selectVersion "DISPLAYNAME" "$xml")
name=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml") [ -n "$id" ] && echo "$id" && return 0
DETECTED=$(getVersion "$name") id=$(selectVersion "PRODUCTNAME" "$xml")
[ -n "$DETECTED" ] && return 0 [ -n "$id" ] && echo "$id" && return 0
tag="PRODUCTNAME" id=$(selectVersion "NAME" "$xml")
name2=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml") [ -n "$id" ] && echo "$id" && return 0
[[ "$name2" == *"Operating System"* ]] && name2=""
DETECTED=$(getVersion "$name2") return 0
[ -n "$DETECTED" ] && return 0
tag="NAME"
name3=$(sed -n "/$tag/{s/.*<$tag>\(.*\)<\/$tag>.*/\1/;p}" <<< "$xml")
DETECTED=$(getVersion "$name3")
[ -n "$DETECTED" ] && return 0
[ -n "$name3" ] && warn "unknown name: '$name3'"
[ -n "$name" ] && warn "unknown displayname: '$name'"
[ -n "$name2" ] && warn "unknown productname: '$name2'"
return 1
} }
detectImage() { detectImage() {
@ -630,7 +653,7 @@ detectImage() {
return 0 return 0
fi fi
local src loc result local src loc info
src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1) src=$(find "$dir" -maxdepth 1 -type d -iname sources | head -n 1)
if [ ! -d "$src" ]; then if [ ! -d "$src" ]; then
@ -646,9 +669,10 @@ detectImage() {
warn "failed to locate 'install.wim' or 'install.esd' in ISO image, $FB" && return 1 warn "failed to locate 'install.wim' or 'install.esd' in ISO image, $FB" && return 1
fi fi
result=$(wimlib-imagex info -xml "$loc" | tr -d '\000') info=$(wimlib-imagex info -xml "$loc" | tr -d '\000')
DETECTED=$(detectVersion "$info")
if ! detectVersion "$result"; then if [ -z "$DETECTED" ]; then
msg="Failed to determine Windows version from image" msg="Failed to determine Windows version from image"
setXML "" && info "${msg}!" || warn "${msg}, $FB" setXML "" && info "${msg}!" || warn "${msg}, $FB"
return 0 return 0