diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 9dd6c848..e67b71ec 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,8 @@ ----------------------------------------- История изменений: +* добалена проверка на кирилицу в путях с предупреждением + ###Scripts version 2251### Дата: 02.02.2024 / Размер скачиваемого обновления: 8 мегабайт * HOTFIX - исправлено автоматическое закрытие EAapp после его установки на некоторых системах diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 1fc2d9a7..ba8bc17b 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -928,6 +928,7 @@ pw_init_db () { fi [[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1 [[ "${START_FROM_PP_GUI}" == 1 ]] && export PW_GUI_DISABLED_CS=0 && unset START_FROM_PP_GUI + return 0 } diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 96e76bc8..b2f98242 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -426,6 +426,7 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_pm_fonts='ШРИФТЫ' export loc_pm_settings='НАСТРОЙКИ' + export loc_warn_cyrillic_in_path="Путь до исполняемого файла содержит кириллические символы.\nИногда это может привести к неработоспособности приложения." elif [[ "${update_loc}" == "ENG" ]] ; then @@ -829,4 +830,6 @@ A brief instruction: export loc_pm_fonts='FONTS' export loc_pm_settings='SETTINGS' + export loc_warn_cyrillic_in_path="The path to the executable file contains Cyrillic characters.\nSometimes this can cause the application to malfunction." + fi diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 81761690..b46d9d40 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -59,6 +59,9 @@ start_portwine () { pw_install_dll_in_prefix init_wine_ver + edit_db_from_gui WARN_CYRILLIC_IN_PATH + unset WARN_CYRILLIC_IN_PATH + if [ ! -f "${HOME}/.Xresources" ]; then cp -f "${PORT_SCRIPTS_PATH}/.Xresources" "${HOME}" xrdb -merge "${HOME}/.Xresources" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 93f30742..c79d6323 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -32,6 +32,14 @@ fi [[ "$MISSING_DESKTOP_FILE" == 1 ]] && portwine_missing_shortcut +if [[ -f "$portwine_exe" ]] \ +&& [[ "${WARN_CYRILLIC_IN_PATH}" != 1 ]] \ +&& echo "${portwine_exe}" | grep -e $'[\u0430-\u044F\u0410-\u042F]' &>/dev/null +then + zenity_info "$loc_warn_cyrillic_in_path" + export WARN_CYRILLIC_IN_PATH="1" +fi + if [[ -f "${PORT_WINE_TMP_PATH}/tmp_main_gui_size" ]] && [[ ! -z "$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size)" ]] ; then export PW_MAIN_SIZE_W="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $1}')" export PW_MAIN_SIZE_H="$(cat ${PORT_WINE_TMP_PATH}/tmp_main_gui_size | awk '{print $2}')"