update init_db and silent download wine

2024-08-01 17:57:03 +03:00
parent 0989a79693
commit ada281b465
8 changed files with 67 additions and 18 deletions
--- a/data_from_portwine/changelog_en
+++ b/data_from_portwine/changelog_en
@@ -2,6 +2,21 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:

+###Scripts version 2331### / Date: 01.08.2024 / Download update size: 4 megabytes
+* fixed downloading of third-party versions of wine registered in the game/program settings file
+* Added audio driver selection to settings (thanks Boria138)
+* added comment for EVE Online (thanks Boria138)
+* improved icon creation functions (thanks to Htylol)
+* improved log creation mode (thanks to Htylol)
+* fixed deletion of shortcuts containing spaces (thanks to Htylol)
+* added/updated settings files for games:
+    * FarCry 4 (thanks Alek V and Mels)
+    * Resident Evil 7: Biohazard (thanks Mels)
+    * Horizon Forbidden West (thanks Mels)
+    * Bright Memory Infinite (thanks Eljeyna)
+    * Lord of The Rings: Battle for MiddleEarth (thanks to user1)
+    * Apollo Justice: Ace Attorney Trilogy (thanks SDR)
+
 ###Scripts version 2330### / Date: 30.07.2024 / Download update size: 4 megabytes
 * updated tray based on libayatana-appindicator (thanks to Htylol)
 * added win11 selection to settings (thanks Boria138)
--- a/data_from_portwine/changelog_ru
+++ b/data_from_portwine/changelog_ru
@@ -2,10 +2,20 @@
 -----------------------------------------
 История изменений:

+###Scripts version 2331### / Дата: 01.08.2024 / Размер скачиваемого обновления: 4 мегабайта
+* исправлено скачивание сторонних версий wine прописанных в файл настроек игры/программы
 * в настройки добавлен выбор аудио драйвера (спасибо Boria138)
-* добавлен комментарий для EVE Online (спасибо Boria138)
+* добавлен комментарий для "EVE Online" для рабочего окружения "Gnome" (спасибо Boria138)
 * улучшены функции создания иконок (спасибо Htylol)
 * улучшен режим создания лога (спасибо Htylol)
+* исправлено удаление ярлыков содержащие пробелы (спасибо Htylol)
+* добавлены/обновлены файлы настроек для игр:
+    * FarCry 4 (спасибо Alek V и Мэлс)
+    * Resident Evil 7: Biohazard (спасибо Мэлс)
+    * Horizon Forbidden West (спасибо Мэлс)
+    * Bright Memory Infinite (спасибо Eljeyna)
+    * Lord of The Rings: Battle for MiddleEarth (спасибо user1)
+    * Apollo Justice: Ace Attorney Trilogy (спасибо SDR)

 ###Scripts version 2330### / Дата: 30.07.2024 / Размер скачиваемого обновления: 4 мегабайта
 * обновлен трей на основе libayatana-appindicator (спасибо Htylol)
--- a/data_from_portwine/scripts/functions_helper
+++ b/data_from_portwine/scripts/functions_helper
@@ -1328,9 +1328,13 @@ pw_init_db () {
            PORTWINE_DB_FILE="${portwine_exe}".ppdb
            # shellcheck source=/dev/null
            source "${PORTWINE_DB_FILE}"
-            if [[ -z "$(ls "${PORT_WINE_PATH}/prefixes/" | grep -e "^${PW_PREFIX_NAME}$")" ]] ; then
-                PW_PREFIX_NAME=$(echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}')
-                edit_db_from_gui PW_PREFIX_NAME
+            if echo "${portwine_exe}" | grep "/prefixes/" &>/dev/null ; then
+                if [[ -z $(ls "${PORT_WINE_PATH}/prefixes/" | grep -e "^${PW_PREFIX_NAME}$") ]] \
+                || [[ -z $(grep -e "^export PW_PREFIX_NAME=" "${PORTWINE_DB_FILE}" 2>/dev/null) ]]
+                then
+                    PW_PREFIX_NAME=$(echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}')
+                    edit_db_from_gui PW_PREFIX_NAME
+                fi
            fi
        else
            orig_IFS="$IFS"
@@ -1365,12 +1369,14 @@ pw_init_db () {
            then
                try_copy_file "${PW_FIND_DB_FILE}" "${portwine_exe}".ppdb
                PORTWINE_DB_FILE="${portwine_exe}".ppdb
-            fi
-
-            if [[ ! -z $(echo "${portwine_exe}" | grep "/data/prefixes/") ]] \
-            && [[ -z $(echo "${portwine_exe}" | grep "/data/prefixes/DEFAULT/") ]]
-            then
-                PW_PREFIX_NAME=$(echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}')
+                if echo "${portwine_exe}" | grep "/prefixes/" &>/dev/null ; then
+                    if [[ -z $(ls "${PORT_WINE_PATH}/prefixes/" | grep -e "^${PW_PREFIX_NAME}$") ]] \
+                    || [[ -z $(grep -e "^export PW_PREFIX_NAME=" "${PORTWINE_DB_FILE}" 2>/dev/null) ]]
+                    then
+                        PW_PREFIX_NAME=$(echo "${portwine_exe}" | awk -F"/prefixes/" '{print $2}' | awk -F"/" '{print $1}')
+                        edit_db_from_gui PW_PREFIX_NAME
+                    fi
+                fi
            fi
        fi

@@ -3308,8 +3314,9 @@ gui_proton_downloader () {
    then PW_WINE_USE="${PW_PROTON_LG_VER}"
    elif [[ "$PW_WINE_USE" == WINE_*_LG ]] || [[ "$PW_WINE_USE" == WINE_LG ]]
    then PW_WINE_USE="${PW_WINE_LG_VER}"
+    elif [[ "$1" == "silent" ]] && [[ ! -z "$2" ]]
+    then PW_WINE_USE="$2"
    fi
-
    export PW_WINE_USE

    if [[ "$1" == "silent" ]] \
@@ -3524,7 +3531,8 @@ gui_proton_downloader () {
        /usr/bin/env bash -c ${pw_full_command_line[*]} &
        exit 0
    else
-        init_wine_ver
+        # init_wine_ver
+        print_error "$PW_WINE_USE"
        for GIVE_WINE_URL in ${WINE_GE_CUSTOM[@]} ${PROTON_GE_GIT[@]} ${WINE_KRON4EK[@]} ${PROTON_PW_GIT[@]} ; do
            if [ ! -z $(echo ${GIVE_WINE_URL} | grep -i "${PW_WINE_USE}") ] ; then
                export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}"
--- a/data_from_portwine/scripts/portwine_db/Apollo_Justice_AAT.ppdb
+++ b/data_from_portwine/scripts/portwine_db/Apollo_Justice_AAT.ppdb
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#Author: rosakodu
+#GS456.exe
+#Rating=1-5
+export PW_VULKAN_USE="2"
+export PW_WINE_USE="PROTON_LG_7-54"
+export PW_PREFIX_NAME="APOLLO_JUSTICE"
+export WINEDLLOVERRIDES="winmm.dll=n,b"
+
+gui_proton_downloader silent "$PW_WINE_USE"
--- a/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest.ppdb
+++ b/data_from_portwine/scripts/portwine_db/HorizonForbiddenWest.ppdb
@@ -3,7 +3,7 @@
 #HorizonForbiddenWest.exe
 #Rating=5
 #####################examples###########################
-export PW_WINE_USE="WINE-9.5-AMD64"
+export PW_WINE_USE="PROTON_LG"
 export PW_WINDOWS_VER="10"
 export PW_DLL_INSTALL=""
 export WINEDLLOVERRIDES=""
@@ -13,5 +13,3 @@ export PW_USE_D3D_EXTRAS="1"
 export PW_FIX_VIDEO_IN_GAME="1"
 export PW_USE_SHADER_CACHE="0"
 export LAUNCH_PARAMETERS="-EpicPortal"
-
-gui_proton_downloader silent "$PW_WINE_USE"
--- a/data_from_portwine/scripts/portwine_db/RF4.ppdb
+++ b/data_from_portwine/scripts/portwine_db/RF4.ppdb
@@ -4,5 +4,3 @@
 #Rating=5
 #####################examples###########################
 export PW_WINE_USE="WINE_LG"
-
-gui_proton_downloader silent "$PW_WINE_USE"
--- a/data_from_portwine/scripts/portwine_db/lotrbfme.ppdb
+++ b/data_from_portwine/scripts/portwine_db/lotrbfme.ppdb
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+#Author: username
+#lotrbfme.exe
+#Rating=1-5
+export PW_VULKAN_USE="2"
+export PW_WINE_USE="PROTON_LG"
+export PORTPROTON_NAME="lotrbfme"
+export PW_WINDOWS_VER="XP"
+export PW_DLL_INSTALL=""
+export WINEDLLOVERRIDES=""
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2330
+#SCRIPTS_NEXT_VERSION=2331
 #SCRIPTS_STABLE_VERSION=2327
 ########################################################################
 export LANGUAGES_LIST="ru es"