From 7558c40042e2c82f134a385f1e612f7646767231 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 25 Apr 2024 22:19:21 +0300 Subject: [PATCH] drop check ru_RU.UTF-8 --- data_from_portwine/scripts/functions_helper | 29 ++++++++----------- .../scripts/pw_autoinstall/PW_WOSB | 2 +- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index c2ba7574..9dc243a9 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -51,24 +51,19 @@ change_locale () { echo "en" > "${PORT_WINE_TMP_PATH}/PortProton_loc" fi - if [[ -z "${LANG}" ]] ; then - export LANG=C - LANGUAGE="en" + if [[ ! -z "${LANGUAGE}" ]] \ + && [[ -f "${PORT_WINE_TMP_PATH}/PortProton_loc" ]] ; then + echo "" else - if [[ ! -z "${LANGUAGE}" ]] \ - && [[ -f "${PORT_WINE_TMP_PATH}/PortProton_loc" ]] ; then - echo "" - else - [[ ! -f "${pw_yad_v13_0}" ]] && pw_yad_v13_0="yad" - SET_LANG=$("${pw_yad_v13_0}" --title "LANGUAGE" --text "Select the language:" --list --radiolist \ - --column="Set:" --column "Choose language:" TRUE "ru" FALSE "en" \ - --window-icon "$PW_GUI_ICON_PATH/portproton.svg" --width=300 --height=150) - SET_LANG="$(echo "${SET_LANG}" | awk -F'|' '{print $2}')" - echo "${SET_LANG}" > "${PORT_WINE_TMP_PATH}/PortProton_loc" - if [[ ! -z "${SET_LANG}" ]] - then LANGUAGE=${SET_LANG} - else exit 1 - fi + [[ ! -f "${pw_yad_v13_0}" ]] && pw_yad_v13_0="yad" + SET_LANG=$("${pw_yad_v13_0}" --title "LANGUAGE" --text "Select the language:" --list --radiolist \ + --column="Set:" --column "Choose language:" TRUE "ru" FALSE "en" \ + --window-icon "$PW_GUI_ICON_PATH/portproton.svg" --width=300 --height=150) + SET_LANG="$(echo "${SET_LANG}" | awk -F'|' '{print $2}')" + echo "${SET_LANG}" > "${PORT_WINE_TMP_PATH}/PortProton_loc" + if [[ ! -z "${SET_LANG}" ]] + then LANGUAGE=${SET_LANG} + else exit 1 fi fi export LANGUAGE diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index f9985cd0..10920531 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -14,7 +14,7 @@ start_portwine if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "Installing World of Sea Battle." - pw_run "${PW_AUTOINSTALL_EXE}" + pw_run "${PW_AUTOINSTALL_EXE}" try_remove_file "${PW_AUTOINSTALL_EXE}" pw_stop_progress_bar kill_portwine