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-18 14:29:31 +02:00 • committed by GitHub
parent 2bef094216
commit fab966da90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/install.sh
View file

@ -453,16 +453,27 @@ detectVersion() {
detectLanguage() { detectLanguage() {
local xml="$1" local xml="$1"
local lang="${xml#*LANGUAGE><DEFAULT>}" local lang=""
lang="${lang%%<*}" if [[ "$xml" == *"LANGUAGE><DEFAULT>"* ]]; then
[ -z "$lang" ] && return 0 lang="${xml#*LANGUAGE><DEFAULT>}"
lang="${lang%%<*}"
else
if [[ "$xml" == *"FALLBACK><DEFAULT>"* ]]; then
lang="${xml#*FALLBACK><DEFAULT>}"
lang="${lang%%<*}"
fi
fi
if [ -z "$lang" ]; then
warn "Language could not be detected from ISO!" && return 0
fi
local culture local culture
culture=$(getLanguage "$lang" "culture") culture=$(getLanguage "$lang" "culture")
[ -n "$culture" ] && LANGUAGE="$lang" && return 0 [ -n "$culture" ] && LANGUAGE="$lang" && return 0
warn "Invalid language detected: $lang" warn "Invalid language detected: \"$lang\""
return 0 return 0
} }
@ -550,7 +561,7 @@ detectImage() {
if [[ "${LANGUAGE,,}" != "en" ]] && [[ "${LANGUAGE,,}" != "en-"* ]]; then if [[ "${LANGUAGE,,}" != "en" ]] && [[ "${LANGUAGE,,}" != "en-"* ]]; then
language=$(getLanguage "$LANGUAGE" "desc") language=$(getLanguage "$LANGUAGE" "desc")
desc="$desc in $language" desc="$desc ($language)"
fi fi
info "Detected: $desc" info "Detected: $desc"