Commit fa40eae2 authored by Mikhail Tergoev's avatar Mikhail Tergoev

Fix log and gamemode

parent 8692507b
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
# Author: PortWINE-Linux.ru # Author: PortWINE-Linux.ru
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
"${WINESERVER}" -k "${WINESERVER}" -k
wine_pids=$(ls -l /proc/*/exe 2>/dev/null | grep -E 'wine(64)?-preloader|wineserver' | perl -pe 's;^.*/proc/(\d+)/exe.*$;$1;g;')
if ! [ -z "${wine_pids}" ] ; then
kill -9 ${wine_pids}
fi
STOP_PORTWINE | pwzen STOP_PORTWINE | pwzen
rm -f "${config_path}/dxvk_on" rm -f "${config_path}/dxvk_on"
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
# Author: Tergoev M.A. # Author: Tergoev M.A.
. "$(dirname $(readlink -f "$0"))/runlib" . "$(dirname $(readlink -f "$0"))/runlib"
START_PORTWINE START_PORTWINE
"${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} | ${var_gamemode} & KILL9_WINEDEVICE "${PROTONRUN}" "run" "${gamestart}" ${launch_parameters} >&2 | ${var_gamemode} > /dev/null & KILL9_WINEDEVICE
STOP_PORTWINE STOP_PORTWINE
...@@ -11,12 +11,14 @@ export gamestart="${PATH_TO_GAME}/.exe" ...@@ -11,12 +11,14 @@ export gamestart="${PATH_TO_GAME}/.exe"
######################################################################## ########################################################################
#__NV_PRIME_RENDER_OFFLOAD=1 #__NV_PRIME_RENDER_OFFLOAD=1
#__GLX_VENDOR_LIBRARY_NAME=nvidia #__GLX_VENDOR_LIBRARY_NAME=nvidia
export MESA_GL_VERSION_OVERRIDE=4.4COMPAT #export MESA_GL_VERSION_OVERRIDE=4.4COMPAT
export STAGING_SHARED_MEMORY=1 export STAGING_SHARED_MEMORY=1
export PROTON_FORCE_LARGE_ADDRESS_AWARE=0 export PROTON_FORCE_LARGE_ADDRESS_AWARE=0
export PROTON_USE_SECCOMP=0 export PROTON_USE_SECCOMP=0
export WINEDLLOVERRIDES="winemenubuilder.exe=d" export WINEDLLOVERRIDES="winemenubuilder.exe=d"
export WINEDEBUG="-all" export WINEDEBUG="-all"
export DXVK_LOG_LEVEL=none
export VKD3D_DEBUG=none
export kill_winedevice=0 export kill_winedevice=0
export kill_explorer=0 export kill_explorer=0
######################################################################## ########################################################################
...@@ -28,6 +30,7 @@ then ###OPENGL### ...@@ -28,6 +30,7 @@ then ###OPENGL###
export vblank_mode=0 export vblank_mode=0
export __GL_SYNC_TO_VBLANK=0 export __GL_SYNC_TO_VBLANK=0
export PROTON_USE_WINED3D=1 export PROTON_USE_WINED3D=1
export PROTON_USE_VKD3D=0
export PROTON_USE_D9VK=0 export PROTON_USE_D9VK=0
export PROTON_NO_D3D11=0 export PROTON_NO_D3D11=0
export PROTON_NO_D3D10=0 export PROTON_NO_D3D10=0
...@@ -37,8 +40,8 @@ else ###DXVK### ...@@ -37,8 +40,8 @@ else ###DXVK###
export vblank_mode=1 export vblank_mode=1
export __GL_SYNC_TO_VBLANK=1 export __GL_SYNC_TO_VBLANK=1
export PROTON_USE_WINED3D=0 export PROTON_USE_WINED3D=0
export PROTON_USE_D9VK=1 export PROTON_USE_D9VK=0
# export PROTON_USE_VKD3D=0 export PROTON_USE_VKD3D=0
export PROTON_NO_D3D11=0 export PROTON_NO_D3D11=0
export PROTON_NO_D3D10=0 export PROTON_NO_D3D10=0
export PROTON_OLD_GL_STRING=0 export PROTON_OLD_GL_STRING=0
...@@ -48,6 +51,9 @@ else ###DXVK### ...@@ -48,6 +51,9 @@ else ###DXVK###
fi fi
######################################################################## ########################################################################
cd "${PATH_TO_GAME}" cd "${PATH_TO_GAME}"
rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/ProgramData/Agent/data"
rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser/Blizzard Entertainment/Battle.net/Cache"
rm -fr "${PORT_WINE_PATH}/data/pfx/drive_c/users/Public/Blizzard Entertainment/Battle.net/Cache"
} }
######################################################################## ########################################################################
ADD_IN_STOP_PORTWINE () ADD_IN_STOP_PORTWINE ()
...@@ -57,6 +63,6 @@ echo " " ...@@ -57,6 +63,6 @@ echo " "
######################################################################## ########################################################################
ADD_IN_POST_INSTALL () ADD_IN_POST_INSTALL ()
{ {
rm -f "${PORT_WINE_PATH}/data/pfx/drive_c/ProgramData/Battle.net/Agent/product.db"
`zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1 `zenity --info --title "${inst_set_top}" --text "${inst_succ}" --no-wrap ` > /dev/null 2>&1
} }
########################################################################
...@@ -8,5 +8,5 @@ chmod +x "${link}/winetricks" ...@@ -8,5 +8,5 @@ chmod +x "${link}/winetricks"
sed -i '2a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${PORT_WINE_PATH}/data/wine/bin/wine" ' "${link}/winetricks" sed -i '2a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${PORT_WINE_PATH}/data/wine/bin/wine" ' "${link}/winetricks"
sleep 1 sleep 1
export WINEDEBUG="" export WINEDEBUG=""
"/usr/bin/xterm" -e "sh ${link}/winetricks -q --force" "/usr/bin/xterm" -e "sh ${link}/winetricks -q"
STOP_PORTWINE STOP_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