Scripts version 2222

data_from_portwine/changelog_eng

 You can help us in the development of the project on the website: https://linux-gaming.ru/donate/
 ----------------------------------------
--
 Changelog:
-###Scripts version 2221### Дата: 19.09.2023 / Download update size: 230 megabytes
+
+###Scripts version 2222### Date: 22.09.2023 / Download update size: 8 megabytes
+* HOTFIX: update prefix
+* WGC and LGC are set in separate prefixes
+* fixed clearing the DOTNET prefix
+* minor changes to the WINE settings tab
+* fixed the function of forcing the use of the English layout
+
+###Scripts version 2221### Date: 19.09.2023 / Download update size: 230 megabytes
 * updated PROTON_LG to version 8-15-1 (fix update prefix)
 * added (спасибо Boria138)
 	REDUCE_PULSE_LATENCY - 'Reduce pulseaudio latency to fix intermittent sound'

data_from_portwine/changelog_rus

@@ -2,11 +2,18 @@
 -----------------------------------------
 История изменений:
 
-###Scripts version 2221### Дата: 19.09.2023 / Размер скачиваемого обновления: 230 мегабай
+###Scripts version 2222### Дата: 22.09.2023 / Размер скачиваемого обновления: 8 мегабайт
+* HOTFIX: обновление префикса, на некоторых ОС
+* WGC и LGC устанавливаются в отдельные префиксы
+* исправлена очистка префикса DOTNET
+* небольшие изменения вкладки настроек WINE
+* исправлена функция принудительного использования английской раскладки
+
+###Scripts version 2221### Дата: 19.09.2023 / Размер скачиваемого обновления: 230 мегабайт
 * обновлен PROTON_LG до версии 8-15-1 (исправлено обновление префикса)
 * добавлены параметры (спасибо Boria138)
     REDUCE_PULSE_LATENCY - 'Уменьшить задержку pulseaudio для исправления прерывистого звука'
-    USE_US_LAYOUT_INFO - 'Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)'
+    USE_US_LAYOUT - 'Принудительное использование английской раскладки (полезно для игр в которых управление верно работает исключительно на английской раскладке)'
 
 ###Scripts version 2220### Дата: 17.09.2023 / Размер скачиваемого обновления: 260 мегабайт
 * HOTFIX: установка Plarium Play перенесена в префикс DOTNET

data_from_portwine/scripts/functions_helper

@@ -233,6 +233,8 @@ unpack_tar () {
 }
 
 pw_clear_pfx () {
+    try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.dotnet48"
+    try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
     try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/system.reg"
     try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/user.reg"
     try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/userdef.reg"
@@ -408,9 +410,9 @@ init_wine_ver () {
 
 pw_init_runtime () {
 
-    if [[ -n "$(grep -E '(ROSA Fresh|RED OS)' "/etc/os-release")" ]] ; then
+    if [[ ! -z "$(grep -E '(ROSA Fresh|RED OS)' "/etc/os-release")" ]] ; then
         export LOCPATH="/run/host/usr/share/locale/"
-    elif [[ -n "$(grep "altlinux" "/etc/os-release")" ]] ; then
+    elif [[ ! -z "$(grep "altlinux" "/etc/os-release")" ]] ; then
         export LIBGL_DRIVERS_PATH="/usr/lib/X11/modules/dri:/usr/lib64/X11/modules/dri"
     fi
 
@@ -601,10 +603,10 @@ pw_kill_autostart () {
 export -f pw_kill_autostart
 
 stop_portwine () { 
-    if [ "$int_xneur" = "1"  ]; then
+    if [[ "$int_xneur" == "1"  ]] ; then
         xneur &
     fi
-    if [ "$PW_USE_US_LAYOUT" != "0" ]; then
+    if [[ "$PW_USE_US_LAYOUT" == "1" ]] ; then
         setxkbmap
     fi
     pw_stop_progress_bar
@@ -613,8 +615,8 @@ stop_portwine () {
     kill_portwine &&
     try_remove_dir "${PW_WINELIB}/var"
     find "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/" -maxdepth 1 -type f -name "*.tmp" -delete
-    if [ ! -z "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" ] ; then
-        kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" 2>/dev/null
+    if [ ! -z "`pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}'`" ] ; then
+        kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}'`" 2>/dev/null
     fi
     add_in_stop_portwine #&>/dev/null
     kill -n 9 `pgrep -a start.sh | grep -i '/PortProton/' | awk '{print $1}'` > /dev/null 2>&1
@@ -874,6 +876,10 @@ pw_init_db () {
         fi
         if [ ! -z "${PORTWINE_DB_FILE}" ]; then
             . "${PORTWINE_DB_FILE}"
+
+            # HOTFIX: update prefix 
+            [[ "$PW_WINE_USE" == "PROTON_LG_8-15" ]] && export PW_WINE_USE="$PW_PROTON_LG_VER"
+            
             init_wine_ver &&
             print_info "Use ${PORTWINE_DB_FILE} db file."
         fi
@@ -881,7 +887,7 @@ pw_init_db () {
             export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )"        
         fi
 
-        if [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] && [[ -n "${WINE_CPU_TOPOLOGY}" ]] ; then
+        if [[ "${PW_WINE_CPU_TOPOLOGY}" == "disabled" ]] && [[ ! -z "${WINE_CPU_TOPOLOGY}" ]] ; then
             export PW_WINE_CPU_TOPOLOGY="${WINE_CPU_TOPOLOGY}"
         fi
         if ls "${PATH_TO_GAME}"/*_Data/Resources/ 2>/dev/null | grep "unity" &>/dev/null \
@@ -961,6 +967,7 @@ pw_port_update () {
                             cd "${PORT_WINE_PATH}/data/"
                             tar -czpf "${PORT_WINE_TMP_PATH}/scripts_backup/scripts_v.${scripts_install_ver}.tar.gz" ./scripts ./img \
                             ./changelog* ./dxvk.conf ./vkBasalt.conf ./tmp/scripts_ver
+                            try_remove_dir "${PORT_WINE_PATH}/data/scripts/portwine_db"
                             cp -fr "${PORT_WINE_TMP_PATH}/PortWINE-master/data_from_portwine/"* "${PORT_WINE_PATH}/data/"
                             try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
                             try_remove_dir "${PORT_WINE_TMP_PATH}/PortWINE-master/"
@@ -1098,7 +1105,7 @@ pw_find_exe () {
     fi
     IFS=$OrigIFS
 
-    if [[ -n "${PW_SET_FIND_EXE}" ]] ; then
+    if [[ ! -z "${PW_SET_FIND_EXE}" ]] ; then
         portwine_exe="${PW_PATH_FOR_FIND}$(echo "${PW_SET_FIND_EXE}" | awk -F'|' '{print $1}')"
         portwine_create_shortcut silent
         /usr/bin/env bash -c ${pw_full_command_line[*]} &

data_from_portwine/scripts/portwine_db/WorldOfSeaBattleClient

@@ -7,7 +7,7 @@
 export PW_COMMENT_DB="World of Sea Battle"
 export PW_PREFIX_NAME="DOTNET"
 export PW_WINDOWS_VER="10"
-export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2"
+export PW_DLL_INSTALL="faudio dotnet48 dotnet20sp2 dotnetdesktop7"
 export WINEDLLOVERRIDES="quartz=b"
 export LAUNCH_PARAMETERS=""
 export PW_VULKAN_USE="1"
@@ -37,5 +37,3 @@ export PW_FIX_VIDEO_IN_GAME="0"
 export PW_USE_AMDVLK_DRIVER="1"
 export PW_FORCE_LARGE_ADDRESS_AWARE="1"
 export PW_USE_SHADER_CACHE="1"
-export PW_WINE_USE=GE-PROTON7-55
-gui_proton_downloader silent "${PW_WINE_USE}"

data_from_portwine/scripts/portwine_db/lgc

+#!/usr/bin/env bash
+#Author: PortWINE
+#lgc_api.exe
+#lgc.exe
+#Rating=5
+export PW_COMMENT_DB="Lesta Game Centers"
+################################################
+export PW_WINE_USE="PROTON_LG_8-4"
+export PW_VULKAN_USE=1                       #dxvk, vkd3d or 0 for OpenGL
+export LAUNCH_PARAMETERS=""            # Additional launch options
+export PW_WINDOWS_VER=10                        # Set windows version 10, 7 or XP
+export WINEDLLOVERRIDES=""
+export PW_DLL_INSTALL="lucida"     # Install DLL in port prefix (used winetricks)
+export PW_USE_D3D_EXTRAS="1"
+export PW_USE_EAC_AND_BE="0"
+export PW_PREFIX_NAME="LGC"
+
+gui_proton_downloader silent "${PW_WINE_USE}"
+
+add_in_start_portwine () {
+    if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then
+        sed -i 's%<igbHardwareAccelerationEnabled> true </igbHardwareAccelerationEnabled>%<igbHardwareAccelerationEnabled> false </igbHardwareAccelerationEnabled>%' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml"
+    fi
+    if [[ "${PW_VULKAN_USE}" == "0" || "${PW_VULKAN_USE}" == "3" ]] ; then
+        export LAUNCH_PARAMETERS="--disable-gpu"
+    fi
+}

data_from_portwine/scripts/portwine_db/wgc

@@ -2,10 +2,8 @@
 #Author: PortWINE
 #wgc.exe
 #wgc_api.exe
-#lgc_api.exe
-#lgc.exe
 #Rating=5
-export PW_COMMENT_DB="Wargaming and Lesta Game Centers"
+export PW_COMMENT_DB="Wargaming Game Centers"
 ################################################
 export PW_WINE_USE="PROTON_LG_8-4"
 export PW_VULKAN_USE=1                       #dxvk, vkd3d or 0 for OpenGL
@@ -17,6 +15,8 @@ export PW_USE_D3D_EXTRAS="1"
 export PW_USE_EAC_AND_BE="0"
 export PW_PREFIX_NAME="WGC"
 
+gui_proton_downloader silent "${PW_WINE_USE}"
+
 add_in_start_portwine () {
     if [[ -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml" ]] ; then
         sed -i 's%<igbHardwareAccelerationEnabled> true </igbHardwareAccelerationEnabled>%<igbHardwareAccelerationEnabled> false </igbHardwareAccelerationEnabled>%' "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/users/${USER}/AppData/Roaming/Wargaming.net/WorldOfTanks/preferences.xml"

data_from_portwine/scripts/pw_autoinstall/PW_LGC

@@ -4,7 +4,7 @@
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Lesta_Game_Center_Install_RU.exe"
 export PW_PREFIX_NAME="LGC"
-
+export PW_WINE_USE="PROTON_LG_8-4"
 try_download_lgc () {
     set -o pipefail
     wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \
@@ -14,7 +14,7 @@ try_download_lgc () {
 }
 
 pw_clear_pfx
-gui_proton_downloader silent "PROTON_LG_8-4"
+gui_proton_downloader silent "${PW_WINE_USE}"
 start_portwine
 
 if try_download_lgc "redirect.lesta.ru/LGC/Lesta_Game_Center_Install_RU.exe"  "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_WGC

@@ -5,6 +5,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT")
 [ "${update_loc}" = "RUS" ] && export WGC_LOC=RU || export WGC_LOC=EU
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe"
 export PW_PREFIX_NAME="WGC"
+export PW_WINE_USE="PROTON_LG_8-4"
 
 try_download_wgc () {
     set -o pipefail
@@ -15,8 +16,9 @@ try_download_wgc () {
 }
 
 pw_clear_pfx
-gui_proton_downloader silent "PROTON_LG_8-4"
+gui_proton_downloader silent "${PW_WINE_USE}"
 start_portwine
+
 if try_download_wgc "redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe"  "${PW_AUTOINSTALL_EXE}"
 then
     pw_start_progress_bar_block "Starting WGC installation..."

data_from_portwine/scripts/pw_autoinstall/PW_WOSB

@@ -6,8 +6,6 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/wos_client.exe"
 export LAUNCH_PARAMETERS=("/VERYSILENT")
 export PW_DLL_INSTALL="faudio dotnet48"
 export PW_VULKAN_USE=1
-export PW_WINE_USE=GE-PROTON7-55
-gui_proton_downloader silent "${PW_WINE_USE}"
 
 start_portwine
 if try_download "165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/runlib

@@ -275,14 +275,16 @@ start_portwine () {
         if [[ -f "${PW_WINELIB}/default_pfx.tar.xz" ]] && [[ "${DISABLE_CP_DEFPFX}" != 1 ]] ; then
             unpack_tar_xz "${PW_WINELIB}/default_pfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" 2>/dev/null
         fi
-        ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
+        ${pw_runtime} env WINEDLLOVERRIDES="winegstreamer=" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
+        "${WINELOADER}" wineboot -u &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
         wait_wineserver &&
         echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
     elif [[ ! -f "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" ]] \
         || [[ -z "`cat "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" | grep ${PW_WINE_USE}`" ]] \
         || [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dosdevices" ]] ; then 
         check_dirs_and_files_in_pfx
-        ${pw_runtime} env LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
+        ${pw_runtime} env WINEDLLOVERRIDES="winegstreamer=" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
+        "${WINELOADER}" wineboot -i &>>"${PORT_WINE_TMP_PATH}/update_pfx_log"
         wait_wineserver &&
         echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver"
     fi
@@ -321,7 +323,7 @@ start_portwine () {
         unset PULSE_LATENCY_MSEC
     fi
 
-    if [[ "${PW_USE_US_LAYOUT}" == 1 ]] ; then
+    if [[ "${PW_USE_US_LAYOUT}" == "1" ]] ; then
         setxkbmap -model pc101 us -print | xkbcomp - $DISPLAY
     fi
 
@@ -594,7 +596,7 @@ start_portwine () {
 
 pw_run () {
     unset GDK_BACKEND
-    if [[ -n "${PATH_TO_GAME}" ]] ; then
+    if [[ ! -z "${PATH_TO_GAME}" ]] ; then
         cd "${PATH_TO_GAME}"
     else
         cd "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c"

data_from_portwine/scripts/var

 #!/usr/bin/env bash
 #Author: Castro-Fidel (linux-gaming.ru)
-#SCRIPTS_NEXT_VERSION=2221
+#SCRIPTS_NEXT_VERSION=2222
 ########################################################################
 export PW_MANGOHUD=0
 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt
@@ -30,6 +30,7 @@ export PROTON_DISABLE_LSTEAMCLIENT="0"
 export PW_FORCE_LARGE_ADDRESS_AWARE="1"
 export PW_MANGOHUD_x32="0"
 export PW_USE_EAC_AND_BE="1"
+export PW_USE_US_LAYOUT="0"
 ###GTK_CONFIG###
 # export GTK_DATA_PREFIX=
 # export GTK_THEME="Adwaita:dark"

data_from_portwine/scripts/zen_yad_gui

@@ -108,8 +108,8 @@ open_changelog () {
 export -f open_changelog
 
 pw_tray_icon () {
-    if [ ! -z "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`" ] ; then
-        kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\-\-notification" | awk '{print $1}'`"
+    if [ ! -z "`pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}'`" ] ; then
+        kill -s SIGUSR1 "`pgrep -a yad_v12_3 | grep "\--notification" | awk '{print $1}'`"
     fi
 
     tray_icon_click () {
@@ -155,7 +155,7 @@ pw_gui_for_edit_db () {
         FPS_LIMIT_VAR="disabled"
     fi
 
-    if [[ -n "${PW_WINE_CPU_TOPOLOGY}" ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "disabled" ]] ; then
+    if [[ ! -z "${PW_WINE_CPU_TOPOLOGY}" ]] && [[ "${PW_WINE_CPU_TOPOLOGY}" != "disabled" ]] ; then
         CPU_LIMIT_VAR="`echo ${PW_WINE_CPU_TOPOLOGY%%:*}`"
     else
         CPU_LIMIT_VAR="disabled"
@@ -366,7 +366,7 @@ gui_proton_downloader () {
         try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git"
         try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine"
 
-    elif [[ "$1" == "silent" ]] && [[ -n "$2" ]] ; then
+    elif [[ "$1" == "silent" ]] && [[ ! -z "$2" ]] ; then
         VERSION_WINE_GIT="$2"
     fi
 

portwine_install_script/PortProton_1.0

@@ -19,7 +19,7 @@ if [ "$my_dir" == "/usr/bin" ] ; then
 		/usr/bin/env bash "${XDG_DATA_HOME}/PortWINE/PortProton/data/scripts/start.sh" "$@"
 		exit 0
 	else
-		if [ -n "$(locale | grep "LANG=ru_RU.UTF-8")" ] ; then
+		if [ ! -z "$(locale | grep "LANG=ru_RU.UTF-8")" ] ; then
 			PW_SET_LANG=$RUS_LANG
 		else
 			PW_SET_LANG=$ENG_LANG