Commit 0bf4fe78 authored by Mikhail Tergoev's avatar Mikhail Tergoev

###Scripts version 1122###

parent 9f0ad22d
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
* добавить контроль за окнами для правильного отключения прогресс бара * добавить контроль за окнами для правильного отключения прогресс бара
* заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
----------------------------------------- -----------------------------------------
###Scripts version 1122###
* обновление скриптов для поддержки нового тестового 91 порта включенным FSR по умолчанию (FSR работает только с играми dx9-12 запущеными под vulkan и при выборе разрешения в игре ниже чем поддерживает монитор)
###Scripts version 1121### ###Scripts version 1121###
* HOTFIX - перенос PW_NO_ESYNC=1 из default db в скрипт var * HOTFIX - перенос PW_NO_ESYNC=1 из default db в скрипт var
* HOTFIX - для успешного запуска игр WGC на системах где не работали игры WoWS и WoT * HOTFIX - для успешного запуска игр WGC на системах где не работали игры WoWS и WoT
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# Author: Castro-Fidel (PortWINE-Linux.ru) # Author: Castro-Fidel (PortWINE-Linux.ru)
######################################################################## ########################################################################
KILL_PORTWINE KILL_PORTWINE
sleep 3
export PW_USER_TEMP="$WINEPREFIX/drive_c/users/${USER}/Temp" export PW_USER_TEMP="$WINEPREFIX/drive_c/users/${USER}/Temp"
export PW_FORCE_LARGE_ADDRESS_AWARE=0 export PW_FORCE_LARGE_ADDRESS_AWARE=0
export PW_USE_GAMEMODE=0 export PW_USE_GAMEMODE=0
...@@ -91,11 +92,12 @@ PW_EPIC () { ...@@ -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}" if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}"
then then
PW_START_PROGRESS_BAR_BLOCK "Installing Epic Games Launcher. Please wait..." 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}" & PW_RUN msiexec /i "${PW_AUTOINSTALL_EXE}" &
sleep 10 sleep 10
if [ ! -z `pgrep msiexec* | head -n 1` ] ; then 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" [ ! -z `pgrep rundll32* | head -n 1` ] && kill -n 9 `pgrep rundll32* | head -n 1` && echo "Kill rundll32.exe"
sleep 5 sleep 5
done done
......
...@@ -593,7 +593,6 @@ RUN_WINETRICKS_FROM_DB () { ...@@ -593,7 +593,6 @@ RUN_WINETRICKS_FROM_DB () {
if [ ! -e "${WINEPREFIX}/winetricks.log" ] ; then if [ ! -e "${WINEPREFIX}/winetricks.log" ] ; then
touch "${WINEPREFIX}/winetricks.log" touch "${WINEPREFIX}/winetricks.log"
fi fi
try_remove_dir "${HOME}/.cache/winetricks/vcrun2019/"
for need_install_dll_to_pfx in ${PW_DLL_INSTALL} ; do 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 if [ "${need_install_dll_to_pfx}" == "vcrun2015" ] || [ "${need_install_dll_to_pfx}" == "vcrun2017" ] ; then
need_install_dll_to_pfx="vcrun2019" need_install_dll_to_pfx="vcrun2019"
...@@ -616,7 +615,7 @@ RUN_WINETRICKS_FROM_DB () { ...@@ -616,7 +615,7 @@ RUN_WINETRICKS_FROM_DB () {
PW_STOP_PROGRESS_BAR PW_STOP_PROGRESS_BAR
print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}" print_info "Try to install DLL in prefix: ${PW_DLL_NEED_INSTALL}"
chmod -R 775 "${HOME}/.cache/winetricks" 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 fi
PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..." PW_START_PROGRESS_BAR_CS "Start ${portname}... Please wait..."
fi fi
......
#!/bin/bash #!/bin/bash
#Author: Castro-Fidel (PortWINE-Linux.ru) #Author: Castro-Fidel (PortWINE-Linux.ru)
#SCRIPTS_VERSION=1121 #SCRIPTS_VERSION=1122
######################################################################## ########################################################################
export PW_MANGOHUD=1 export PW_MANGOHUD=1
export MANGOHUD_CONFIG=font_size=24,position=top-left,toggle_hud=Shift_R+F12,no_display 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 ...@@ -33,6 +33,13 @@ export gecko_ver=2.47.2
export WINEDIR="${PORT_WINE_PATH}/data/dist" export WINEDIR="${PORT_WINE_PATH}/data/dist"
export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export WINEPREFIX="${PORT_WINE_PATH}/data/pfx"
export WINE_WIN_START="start.exe /i /unix" 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 () ADD_IN_START_PORTWINE ()
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment