From 8561e0e3c7a8c4295d0c13359615ef4d4f0b1c26 Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 17 May 2024 23:35:58 +0200 Subject: [PATCH] Update install.sh --- src/install.sh | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/install.sh b/src/install.sh index 06c2415..970961d 100644 --- a/src/install.sh +++ b/src/install.sh @@ -590,28 +590,26 @@ updateAsset() { local asset="$1" local language="$2" - local culture keyboard + local culture region keyboard - # : "${KEYBOARD:=""}" - # : "${TIMEZONE:=""}" - # : "${LANGUAGE:=""}" # : "${PASSWORD:=""}" - # - # en-US - # en-US - # - culture=$(getLanguage "$language" "culture") if [ -n "$culture" ] && [[ "${culture,,}" != "en-us" ]]; then - sed -i "s/en-US<\/UserLocale>/$culture<\/UserLocale>/g" "$asset" sed -i "s/en-US<\/UILanguage>/$culture<\/UILanguage>/g" "$asset" - sed -i "s/en-US<\/SystemLocale>/$culture<\/SystemLocale>/g" "$asset" + fi + + region="$culture" +. [ -n "$REGION" ] && region="$REGION" + + if [ -n "$region" ] && [[ "${region,,}" != "en-us" ]]; then + sed -i "s/en-US<\/UserLocale>/$region<\/UserLocale>/g" "$asset" + sed -i "s/en-US<\/SystemLocale>/$region<\/SystemLocale>/g" "$asset" fi keyboard="$culture" - [ -n "$KEYBOARD" ] && keyboard="$KEYBOARD" +. [ -n "$KEYBOARD" ] && keyboard="$KEYBOARD" if [ -n "$keyboard" ] && [[ "${keyboard,,}" != "en-us" ]]; then sed -i "s/en-US<\/InputLocale>/$keyboard<\/InputLocale>/g" "$asset"