From 0bf4fe78160d07a7b616e6a0d4001f2b10d4b1f6 Mon Sep 17 00:00:00 2001
From: castro-fidel <tergoevm@gmail.com>
Date: Fri, 23 Jul 2021 19:26:31 +0300
Subject: [PATCH] ###Scripts version 1122###

---
 data_from_portwine/changelog           | 3 +++
 data_from_portwine/scripts/autoinstall | 6 ++++--
 data_from_portwine/scripts/runlib      | 3 +--
 data_from_portwine/scripts/var         | 9 ++++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/data_from_portwine/changelog b/data_from_portwine/changelog
index 008b0edd..f90fd5f2 100644
--- a/data_from_portwine/changelog
+++ b/data_from_portwine/changelog
@@ -7,6 +7,9 @@
 * добавить контроль за окнами для правильного отключения прогресс бара
 * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
 -----------------------------------------
+###Scripts version 1122###
+* обновление скриптов для поддержки нового тестового 91 порта включенным FSR по умолчанию (FSR работает только с играми dx9-12 запущеными под vulkan и при выборе разрешения в игре ниже чем поддерживает монитор)
+
 ###Scripts version 1121###
 * HOTFIX - перенос PW_NO_ESYNC=1 из default db в скрипт var
 * HOTFIX - для успешного запуска игр WGC на системах где не работали игры WoWS и WoT
diff --git a/data_from_portwine/scripts/autoinstall b/data_from_portwine/scripts/autoinstall
index 28ab30ed..95df9487 100644
--- a/data_from_portwine/scripts/autoinstall
+++ b/data_from_portwine/scripts/autoinstall
@@ -2,6 +2,7 @@
 # Author: Castro-Fidel (PortWINE-Linux.ru)
 ########################################################################
 KILL_PORTWINE
+sleep 3
 export PW_USER_TEMP="$WINEPREFIX/drive_c/users/${USER}/Temp"
 export PW_FORCE_LARGE_ADDRESS_AWARE=0
 export PW_USE_GAMEMODE=0
@@ -91,11 +92,12 @@ PW_EPIC () {
     if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}"
     then
         PW_START_PROGRESS_BAR_BLOCK "Installing Epic Games Launcher. Please wait..."
-        pw_kill_autostart EpicGamesLauncher.exe
+        pw_kill_autostart EpicGamesLauncher.exe &
         PW_RUN msiexec /i "${PW_AUTOINSTALL_EXE}" &
         sleep 10
         if [ ! -z `pgrep msiexec* | head -n 1` ] ; then
-            while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] || [ ! -z `pgrep wrap | head -n 1` ]; do
+            while [ ! -z `pgrep msiexec* | head -n 1` ] || [ ! -z `pgrep rundll32* | head -n 1` ] || [ ! -z `pgrep -a wrap | grep ${portname} | head -n 1` ]
+            do
                 [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe"
                 sleep 5
             done
diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib
index 9e07ba60..d2b04e87 100755
--- a/data_from_portwine/scripts/runlib
+++ b/data_from_portwine/scripts/runlib
@@ -593,7 +593,6 @@ RUN_WINETRICKS_FROM_DB () {
         if [ ! -e "${WINEPREFIX}/winetricks.log" ] ; then
             touch "${WINEPREFIX}/winetricks.log"
         fi
-        try_remove_dir "${HOME}/.cache/winetricks/vcrun2019/"
         for need_install_dll_to_pfx in ${PW_DLL_INSTALL} ; do
             if [ "${need_install_dll_to_pfx}" == "vcrun2015" ] || [ "${need_install_dll_to_pfx}" == "vcrun2017" ] ; then
                 need_install_dll_to_pfx="vcrun2019"
@@ -616,7 +615,7 @@ RUN_WINETRICKS_FROM_DB () {
             PW_STOP_PROGRESS_BAR
             print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}"
             chmod -R 775 "${HOME}/.cache/winetricks"
-            ${PW_RUNTIME} xterm -e env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${PORT_WINE_TMP_PATH}/winetricks" -q ${PW_DLL_NEED_INSTALL}
+            ${PW_RUNTIME} xterm -e env LD_LIBRARY_PATH="${PW_AND_RUNTIME_LIBRARY_PATH}${LD_LIBRARY_PATH}" "${PORT_WINE_TMP_PATH}/winetricks" -q -f ${PW_DLL_NEED_INSTALL}
         fi
         PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..."
     fi
diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var
index edf4160a..7f7030ce 100755
--- a/data_from_portwine/scripts/var
+++ b/data_from_portwine/scripts/var
@@ -1,6 +1,6 @@
 #!/bin/bash
 #Author: Castro-Fidel (PortWINE-Linux.ru)
-#SCRIPTS_VERSION=1121
+#SCRIPTS_VERSION=1122
 ########################################################################
 export PW_MANGOHUD=1
 export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display
@@ -33,6 +33,13 @@ export gecko_ver=2.47.2
 export WINEDIR="${PORT_WINE_PATH}/data/dist"
 export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
 export WINE_WIN_START="start.exe /i /unix"
+
+if [ ! -z "`cat "${PORT_WINE_PATH}/data/dist/version" | grep "GE"`" ] ; then 
+    export WINE_FULLSCREEN_FSR=1
+    export WINE_FULLSCREEN_FSR_STRENGTH=1
+    export mono_ver=6.2.2
+fi
+
 #################################################################
 ADD_IN_START_PORTWINE ()
 {