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 15:19:15 +02:00 • committed by GitHub
parent 1f99fafb47
commit 00c54e7e20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/install.sh
View file

@ -556,6 +556,9 @@ setXML() {
local file="$STORAGE/custom.xml" local file="$STORAGE/custom.xml"
[ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0 [ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0
file="/run/assets/custom.xml"
[ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0
file="$1" file="$1"
[ -z "$file" ] && file="/run/assets/$DETECTED.xml" [ -z "$file" ] && file="/run/assets/$DETECTED.xml"
[ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0 [ -f "$file" ] && [ -s "$file" ] && XML="$file" && return 0
@ -577,26 +580,26 @@ selectVersion() {
[ -z "$id" ] && info "Unknown ${tag,,}: '$name'" && return 0 [ -z "$id" ] && info "Unknown ${tag,,}: '$name'" && return 0
prefer="$id-enterprise" prefer="$id-enterprise"
find=$(printEdition "$prefer" "") [ -f "/run/assets/$prefer.xml" ] && find=$(printEdition "$prefer" "") || find=""
if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then
echo "$prefer" && return 0 echo "$prefer" && return 0
fi fi
prefer="$id-ultimate" prefer="$id-ultimate"
find=$(printEdition "$prefer" "") [ -f "/run/assets/$prefer.xml" ] && find=$(printEdition "$prefer" "") || find=""
if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then
echo "$prefer" && return 0 echo "$prefer" && return 0
fi fi
prefer="$id" prefer="$id"
find=$(printEdition "$prefer" "") [ -f "/run/assets/$prefer.xml" ] && find=$(printEdition "$prefer" "") || find=""
if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then if [ -n "$find" ] && [[ "${xml,,}" == *"<${tag,,}>${find,,}</${tag,,}>"* ]]; then
echo "$prefer" && return 0 echo "$prefer" && return 0
fi fi
prefer=$(getVersion "$name") prefer=$(getVersion "$name")
echo "$prefer"
echo "$prefer"
return 0 return 0
} }