From 0d7191e1136c700b4876bbdab55449d500d6c48d Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 18 May 2024 00:08:06 +0200 Subject: [PATCH] Update install.sh --- src/install.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/install.sh b/src/install.sh index aab1097..aaa5247 100644 --- a/src/install.sh +++ b/src/install.sh @@ -592,30 +592,40 @@ updateAsset() { local language="$2" local culture region keyboard - # : "${PASSWORD:=""}" - culture=$(getLanguage "$language" "culture") if [ -n "$culture" ] && [[ "${culture,,}" != "en-us" ]]; then sed -i "s/en-US<\/UILanguage>/$culture<\/UILanguage>/g" "$asset" fi - region="$culture" - [ -n "$REGION" ] && region="$REGION" + region="$REGION" + [ -z "$region" ] && region="$culture" 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" + keyboard="$KEYBOARD" + [ -z "$keyboard" ] && keyboard="$culture" if [ -n "$keyboard" ] && [[ "${keyboard,,}" != "en-us" ]]; then sed -i "s/en-US<\/InputLocale>/$keyboard<\/InputLocale>/g" "$asset" sed -i "s/0409:00000409<\/InputLocale>/$keyboard<\/InputLocale>/g" "$asset" fi + if [ -n "$USERNAME" ]; then + sed -i "s/where name=\"Docker\"/where name=\"$USERNAME\"/g" "$asset" + sed -i "s/Docker<\/Name>/$USERNAME<\/Name>/g" "$asset" + sed -i "s/Docker<\/FullName>/$USERNAME<\/FullName>/g" "$asset" + sed -i "s/Docker<\/Username>/$USERNAME<\/Username>/g" "$asset" + fi + + if [ -n "$PASSWORD" ]; then + sed -i "s/.*/.*$PASSWORD<\/Value>/g" "$asset" + sed -i "s/.*/.*$PASSWORD<\/Value>/g" "$asset" + fi + cat "$asset" exit 13 return 0