Merge branch 'master' into merge-need

data_from_portwine/changelog_en

@@ -2,6 +2,15 @@ You can help us in the development of the project on the website: https://linux-
 ----------------------------------------
 Changelog:
 
+###Scripts version 2308### Date: 18.06.2024 / Download update size: 187 megabytes
+* updated WINE_LG to version "9-11"
+* BattleNET auto-installation has been moved to a separate BATTLE_NET prefix
+
+###Scripts version 2307### Date: 18.06.2024 / Download update size: 4 megabytes
+* fixed auto-installation of Battle NET
+* refactoring scripts to optimize the interface (thanks Htylol)
+* replacing copying libraries into a prefix with creating symbolic links
+
 ###Scripts version 2306### Date: 14.06.2024 / Download update size: 4 megabytes
 * the yad version has been updated to improve the interface settings (thanks Htylol)
 * the language selection interface has been updated (thanks to Boria138)

data_from_portwine/changelog_ru

@@ -2,6 +2,15 @@
 -----------------------------------------
 История изменений:
 
+###Scripts version 2308### Дата: 18.06.2024 / Размер скачиваемого обновления: 187 мегабайта
+* обновлен WINE_LG до версии "9-11"
+* автоустановка BattleNET перенесена в отдельный префикс BATTLE_NET
+
+###Scripts version 2307### Дата: 18.06.2024 / Размер скачиваемого обновления: 4 мегабайта
+* исправлена автоустановка BattleNET
+* рефакторинг скриптов для оптимизации работы интерфейса (спасибо Htylol)
+* замена копирования библиотек в префикс на создание символьных ссылок
+
 ###Scripts version 2306### Дата: 14.06.2024 / Размер скачиваемого обновления: 4 мегабайта
 * обновлена версия yad - для улучшения настройки интерфейса (спасибо Htylol)
 * обновлен интерфейс выбора языка (спасибо Boria138)

data_from_portwine/scripts/functions_helper

@@ -198,7 +198,6 @@ check_process () {
 export -f check_process
 
 try_download () {
-    local filename="$(basename "$1")"
     local dest="$2"
     local silent="false"
     local no_mirror="false"
@@ -210,6 +209,13 @@ try_download () {
                 no_mirror=true
     esac
 
+    if [[ -n "${PW_AUTOINSTALL_EXE}" ]] \
+    && [[ "$no_mirror" == "true" ]] ; then
+        local filename="$(basename "${PW_AUTOINSTALL_EXE}")"
+    else
+        local filename="$(basename "$1")"
+    fi
+
     if [[ "${MIRROR}" == CDN ]] \
     && [[ "$no_mirror" != "true" ]]
     then
@@ -1265,15 +1271,6 @@ pw_init_db () {
             check_variables PW_USE_FAKE_DLSS "0"
             check_variables PW_USE_RAY_TRACING "1"
         fi
-
-        if grep "ru" "${PORT_WINE_TMP_PATH}/PortProton_loc" &>/dev/null ; then
-            for chk_lang_and_uname in "steam_emu.ini" "steam_api.ini" "steam_api64.ini" ; do
-                if [[ -f "${PATH_TO_GAME}/${chk_lang_and_uname}" ]] ; then
-                    sed -i "s/Language=english/Language=russian/" "${PATH_TO_GAME}/${chk_lang_and_uname}"
-                    sed -i "/UserName=/c\UserName=${USER}" "${PATH_TO_GAME}/${chk_lang_and_uname}"
-                fi
-            done
-        fi
     fi
 
     [[ "${START_FROM_STEAM}" == 1 ]] && export PW_GUI_DISABLED_CS=1
@@ -1705,11 +1702,7 @@ start_portwine () {
             pw_wineboot -r
         fi
     fi
-    if grep 'xapofx1_' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" &>/dev/null ; then
-        sed -i '/xapofx1_/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg"
-        sed -i '/x3daudio/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg"
-        sed -i '/xaudio2/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg"
-    fi
+
     echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
 
     if [[ "${PW_NO_ESYNC}" == 1 ]]
@@ -2080,7 +2073,7 @@ start_portwine () {
 
     # DGVOODOO2 enable:
     if [[ "${PW_DGVOODOO2}" == "1" ]] ; then
-        print_info "Try copy native DGVOODOO2 files..."
+        print_info "Try create symlink DGVOODOO2 files..."
         PATH_TO_DGV2_FILES="${PW_VULKAN_DIR}/dgvoodoo2-${DGV2_VER}"
         CP_DGV2_FILES="ddraw d3dimm d3d8 d3d9 glide glide2x glide3x"
         try_copy_file "${PATH_TO_DGV2_FILES}/dgVoodoo.conf" "${WINEPREFIX}/drive_c/windows/syswow64/"
@@ -2164,7 +2157,7 @@ start_portwine () {
     done
 
     if [[ ! -z "$CP_DXVK_FILES" ]] ; then
-        print_info "Try copy native DXVK files..."
+        print_info "Try create symlink DXVK files..."
         check_variables DXVK_HDR "0"
         for wine_dxvk_dll in $CP_DXVK_FILES ; do
             if [[ -f "${PATH_TO_DXVK_FILES}/x64/${wine_dxvk_dll}.dll"  ]] ; then
@@ -2187,7 +2180,7 @@ start_portwine () {
     fi
 
     if [[ ! -z "$CP_VKD3D_FILES" ]] ; then
-        print_info "Try copy native VKD3D files..."
+        print_info "Try create symlink VKD3D files..."
         for wine_vkd3d_dll in $CP_VKD3D_FILES ; do
             if [[ -f "${PATH_TO_VKD3D_FILES}/x64/${wine_vkd3d_dll}.dll" ]] ; then
                 try_force_link_file "${PATH_TO_VKD3D_FILES}/x86/${wine_vkd3d_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_vkd3d_dll}.dll"
@@ -2200,7 +2193,7 @@ start_portwine () {
     fi
 
     if [[ ! -z "$CP_D8VK_FILES" ]] ; then
-        print_info "Try copy native D8VK files..."
+        print_info "Try create symlink D8VK files..."
         PATH_TO_D8VK_FILES="${PW_VULKAN_DIR}/d8vk-${D8VK_VER}"
         for wine_d8vk_dll in $CP_D8VK_FILES ; do
             try_force_link_file "${PATH_TO_D8VK_FILES}/x32/${wine_d8vk_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/${wine_d8vk_dll}.dll"
@@ -2210,7 +2203,7 @@ start_portwine () {
     fi
 
     if [[ "$CP_GALLIUM_NINE_FILES" == "d3d9" ]] ; then
-        print_info "Try copy native GALLIUM_NINE files..."
+        print_info "Try create symlink GALLIUM_NINE files..."
         PATH_TO_GALLIUM_NINE_FILES="${PW_PLUGINS_PATH}/gallium_nine_v.${PW_GALLIUM_NINE_VER}"
         try_force_link_file "${PATH_TO_GALLIUM_NINE_FILES}/lib32/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/syswow64/d3d9.dll"
         try_force_link_file "${PATH_TO_GALLIUM_NINE_FILES}/lib64/d3d9-nine.dll.so" "${WINEPREFIX}/drive_c/windows/system32/d3d9.dll"
@@ -2400,6 +2393,16 @@ start_portwine () {
         export DXVK_CONFIG_FILE="${PATH_TO_GAME}/dxvk.conf"
     fi
 
+    if  [[ "$LANGUAGE" == "ru" ]] ; then
+        for chk_lang_and_uname in "steam_emu.ini" "steam_api.ini" "steam_api64.ini" "SteamConfig.ini" ; do
+            if [[ -f "${PATH_TO_GAME}/${chk_lang_and_uname}" ]] ; then
+                sed -i "/Language/c\Language=russian/" "${PATH_TO_GAME}/${chk_lang_and_uname}"
+                sed -i "/UserName/c\UserName=${USER}" "${PATH_TO_GAME}/${chk_lang_and_uname}"
+                sed -i "/PlayerName/c\PlayerName=${USER}" "${PATH_TO_GAME}/${chk_lang_and_uname}"
+            fi
+        done
+    fi
+
     if [[ "${PW_DISABLE_COMPOSITING}" == "1" ]] \
     && ! check_gamescope_session
     then

data_from_portwine/scripts/portwine_db/VKPlayLoader

@@ -16,8 +16,6 @@ export PW_USE_GSTREAMER="1"
 export PW_VULKAN_USE="2"
 export PW_WINE_USE="WINE_LG"
 
-gui_proton_downloader silent "$PW_WINE_USE"
-
 add_in_start_portwine () {
     if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg" ]] ; then
         sed -i '/Software\\\\Wine\\\\Explorer/d' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg"

data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET

 #!/usr/bin/env bash
 # Author: Castro-Fidel (linux-gaming.ru)
 ########################################################################
-[[ "$LANGUAGE" == "ru" ]] && export BN_LOC=ruRU || export BN_LOC=enUS
-export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe"
+export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup.exe"
 export PW_WINE_USE="WINE_LG"
+export WINEDLLOVERRIDES="locationapi="
+export PW_PREFIX_NAME="BATTLE_NET"
 
 start_portwine
 if try_download "https://battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" no_mirror

data_from_portwine/scripts/start.sh

@@ -78,7 +78,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T
 unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY
 unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48
 unset MANGOHUD_CONFIG FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR
-unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START
+unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE
 
 export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
 rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}*

data_from_portwine/scripts/var

 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2307
+
+#SCRIPTS_NEXT_VERSION=2308
 ########################################################################
 export LANGUAGES_LIST="ru es"
 export PW_MANGOHUD="0"
@@ -48,7 +49,7 @@ export PW_FAKE_DLSS_3_VER="090"
 export PW_GALLIUM_NINE_VER="0.9"
 ###WINE_AND_PROTON_LG###
 export PW_PROTON_LG_VER="PROTON_LG_9-5-1"
-export PW_WINE_LG_VER="WINE_LG_9-10"
+export PW_WINE_LG_VER="WINE_LG_9-11"
 export PW_WINE_FULLSCREEN_FSR="1"
 export WINE_FULLSCREEN_FSR_MODE="ultra"
 ###DXVK_AND_VKD3D###