mirror of
https://github.com/dockur/windows.git
synced 2026-08-24 15:48:59 +01:00
fix: ISO language detection being lost in subshell (#2071)
This commit is contained in:
+3
-6
@@ -1279,14 +1279,9 @@ unknownImage() {
|
|||||||
|
|
||||||
describeImage() {
|
describeImage() {
|
||||||
|
|
||||||
local info_xml="$1"
|
|
||||||
local index="$2"
|
|
||||||
|
|
||||||
local result
|
local result
|
||||||
result=$(printEdition "$DETECTED" "$DETECTED" "Y") || return 1
|
result=$(printEdition "$DETECTED" "$DETECTED" "Y") || return 1
|
||||||
|
|
||||||
detectLanguage "$info_xml" "$index" || return 1
|
|
||||||
|
|
||||||
if [[ "${LANGUAGE,,}" != "en" && "${LANGUAGE,,}" != "en-"* ]]; then
|
if [[ "${LANGUAGE,,}" != "en" && "${LANGUAGE,,}" != "en-"* ]]; then
|
||||||
local language
|
local language
|
||||||
language=$(getLanguage "$LANGUAGE" "desc") || return 1
|
language=$(getLanguage "$LANGUAGE" "desc") || return 1
|
||||||
@@ -1355,7 +1350,9 @@ detectImageInfo() {
|
|||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
desc=$(describeImage "$image_info" "$index") || return 1
|
detectLanguage "$image_info" "$index" || return 1
|
||||||
|
|
||||||
|
desc=$(describeImage) || return 1
|
||||||
info "Detected: $desc"
|
info "Detected: $desc"
|
||||||
|
|
||||||
configureImage "$index" "$desc" || return 1
|
configureImage "$index" "$desc" || return 1
|
||||||
|
|||||||
Reference in New Issue
Block a user