From 37e33bae9e3fd0885813ba8608d3d20b3d02e0c9 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Thu, 1 Aug 2024 14:37:23 +0300 Subject: [PATCH] update eve.ppdb --- data_from_portwine/changelog_ru | 3 +++ data_from_portwine/scripts/functions_helper | 11 +++++++++-- data_from_portwine/scripts/portwine_db/eve.ppdb | 11 +++++++---- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index cf79089c..dc9dd0b5 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +* в настройки добавлен выбор аудио драйвера (спасибо Boria138) +* добавлен комментарий для EVE Online (спасибо Boria138) + ###Scripts version 2330### / Дата: 30.07.2024 / Размер скачиваемого обновления: 4 мегабайта * обновлен трей на основе libayatana-appindicator (спасибо Htylol) * в настройки добавлен выбор win11 (спасибо Boria138) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 896e3bcd..2e0f5b5f 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -2687,13 +2687,20 @@ start_portwine () { fi fi - if [[ "${PW_SOUND_DRIVER_USE}" != "disabled" ]] && [[ ! $(grep "\"Audio\"=\"$PW_SOUND_DRIVER_USE\"" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg") ]] ; then - if [[ $(grep "\"Audio\"=" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg") ]] ; then + if [[ "${PW_SOUND_DRIVER_USE}" != "disabled" ]] \ + && grep -v "\"Audio\"=\"$PW_SOUND_DRIVER_USE\"" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" &>/dev/null + then + if grep "\"Audio\"=" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" &>/dev/null ; then sed -i 's/"Audio"=".*"/"Audio"="'${PW_SOUND_DRIVER_USE}'"/' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" else echo -e '\n[Software\\Wine\\Drivers]\n"Audio"="'${PW_SOUND_DRIVER_USE}'"' >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" fi kill_portwine + elif [[ "${PW_SOUND_DRIVER_USE}" == "disabled" ]] \ + && grep -v "\"Audio\"=" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" &>/dev/null + then + sed -i '/\[Software\\Wine\\Drivers\]/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" &>/dev/null + sed -i "/\"Audio\"=/d" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" &>/dev/null fi pw_stop_progress_bar && diff --git a/data_from_portwine/scripts/portwine_db/eve.ppdb b/data_from_portwine/scripts/portwine_db/eve.ppdb index 4015445e..e87c35f5 100644 --- a/data_from_portwine/scripts/portwine_db/eve.ppdb +++ b/data_from_portwine/scripts/portwine_db/eve.ppdb @@ -5,10 +5,13 @@ #eve-online.exe #Rating=5 #####################examples########################### -if [[ "$LANGUAGE" == "ru" ]] ; then - export PW_COMMENT_DB="Если в GNOME наблюдаются вылеты, лаги и проблемы с потреблением видеопамяти\n попробуйте увеличить check-alive-timeout до 15000 (15 секунд)" -else - export PW_COMMENT_DB="If you are experiencing crashes, lags and video memory consumption problems in GNOME\n, try increasing check-alive-timeout to 15000 (15 seconds)." +if [[ "${DESKTOP_SESSION}" =~ "gnome" ]] \ +&& gsettings get org.gnome.mutter check-alive-timout | grep -v "15000" &>/dev/null ; then + if [[ "$LANGUAGE" == "ru" ]] ; then + export PW_COMMENT_DB="Если в GNOME наблюдаются вылеты, лаги и проблемы с потреблением видеопамяти\n попробуйте увеличить check-alive-timeout до 15000 (15 секунд)" + else + export PW_COMMENT_DB="If you are experiencing crashes, lags and video memory consumption problems in GNOME\n, try increasing check-alive-timeout to 15000 (15 seconds)." + fi fi export PW_WINDOWS_VER="10" export PW_WINE_USE="WINE_LG"