Commit c78720a4 authored by Mikhail Tergoev's avatar Mikhail Tergoev

Major changes port_on and add use terminal in vars

parent 8fc3301f
......@@ -68,9 +68,9 @@ export PW_WINEDBG_DISABLE=0
if [ ! -z ${optirun_on} ]
then
${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
$PW_TERM ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
else
"${port_on_run}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
$PW_TERM "${port_on_run}" "run" "${gamestart}" ${launch_parameters} >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
fi
zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap && "${WINESERVER}" -k
STOP_PORTWINE | pwzen
......
......@@ -6,9 +6,9 @@ if [ -f "$1" ]; then
export PATH_TO_GAME="$( cd "$( dirname "$1" )" >/dev/null 2>&1 && pwd )"
START_PORTWINE
if [ ! -z ${optirun_on} ]; then
${optirun_on} "${port_on_run}" "run" "$portwine_exe"
$PW_TERM ${optirun_on} "${port_on_run}" "run" "$portwine_exe"
else
"${port_on_run}" "run" "$portwine_exe"
$PW_TERM "${port_on_run}" "run" "$portwine_exe"
fi
else
START_PORTWINE
......
......@@ -53,6 +53,19 @@ export PW_COMPAT_MEDIA_PATH="${PW_COMPAT_MEDIA_PATH}"
########################################################################
export urlg="http://portwine-linux.ru/donate"
########################################################################
export PW_TERM=""
if [ "${PW_USE_TERMINAL}" = "1" ]; then
if [ -x "`which konsole 2>/dev/null`" ]; then
export PW_TERM="konsole -e"
elif [ -x "`which xfce4-terminal 2>/dev/null`" ]; then
export PW_TERM="xfce4-terminal -e"
elif [ -x "`which xterm 2>/dev/null`" ]; then
export PW_TERM="xterm -e"
elif [ -x "`which gnome-terminal 2>/dev/null`" ]; then
export PW_TERM="gnome-terminal -- $SHELL -c"
fi
fi
########################################################################
START_PORTWINE ()
{
sh "${PORT_SCRIPTS_PATH}"/port_update
......
......@@ -6,15 +6,15 @@ START_PORTWINE
if [ ! -z "$1" ]; then
if [ ! -z $optirun_on ]; then
${optirun_on} "${port_on_run}" "run" "$1"
$PW_TERM ${optirun_on} "${port_on_run}" "run" "$1"
else
"${port_on_run}" "run" "$1"
$PW_TERM "${port_on_run}" "run" "$1"
fi
else
if [ ! -z $optirun_on ]; then
${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters}
$PW_TERM ${optirun_on} "${port_on_run}" "run" "${gamestart}" ${launch_parameters}
else
"${port_on_run}" "run" "${gamestart}" ${launch_parameters}
$PW_TERM "${port_on_run}" "run" "${gamestart}" ${launch_parameters}
fi
fi
......
......@@ -21,17 +21,20 @@ export PW_NO_D3D10=0 # Disable d3d10.dll, for d3d10 games which can fall
export PW_NO_D3D11=0 # Disable d3d11.dll, for d3d11 games which can fall back to and run better with d3d9
export PW_NO_D3D12=0 # Disable d3d12.dll, for d3d12 games which can fall back to and run better with d3d11 or d3d9
export PW_NO_FSYNC=0 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support.
export PW_NO_ESYNC=1 # Do not use eventfd-based in-process synchronization primitives
export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives
export PW_DXVK_ASYNC=0
export PW_DXGI_NATIVE=0
export PW_USE_SECCOMP=0 #Note: Obsoleted in Proton 5.13. In older versions, enable seccomp-bpf filter to emulate native syscalls, required for some DRM protections to work.
export PW_USE_TERMINAL=0
export PW_OLD_GL_STRING=0
export PW_NO_WINEMFPLAY=0
export PW_NVAPI_DISABLE=1
export PW_NO_WRITE_WATCH=0 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games).
export PW_HIDE_NVIDIA_GPU=0
export PW_FORCE_USE_VSYNC=2 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT
export PW_WINEDBG_DISABLE=1
export PW_PULSE_LOWLATENCY=0
export PW_VKD3D_FEATURE_LEVEL=0
export PW_FORCE_DISABLED_GAMEMOD=0 # Force disabele gamemod
export PW_FORCE_LARGE_ADDRESS_AWARE=1 # Force Wine to enable the LARGE_ADDRESS_AWARE flag for all executables. Enabled by default.
########################################################################
......
......@@ -6,8 +6,8 @@ START_PORTWINE
PW_LOG=1
if [ ! -z ${optirun_on} ]
then
${optirun_on} "${port_on_run}" "run" "winecfg" >&2
$PW_TERM ${optirun_on} "${port_on_run}" "run" "winecfg" >&2
else
"${port_on_run}" "run" "winecfg" >&2
$PW_TERM "${port_on_run}" "run" "winecfg" >&2
fi
STOP_PORTWINE
......@@ -5,8 +5,8 @@ START_PORTWINE
PW_LOG=1
if [ ! -z ${optirun_on} ]
then
"/usr/bin/xterm" -e '"${optirun_on}" "${port_on_run}" "run" "cmd"'
$PW_TERM '"${optirun_on}" "${port_on_run}" "run" "cmd"'
else
"/usr/bin/xterm" -e '"${port_on_run}" "run" "cmd"'
$PW_TERM '"${port_on_run}" "run" "cmd"'
fi
STOP_PORTWINE
......@@ -72,9 +72,9 @@ export PW_LOG=1
export PW_WINEDBG_DISABLE=0
if [ ! -z ${optirun_on} ]
then
${optirun_on} "${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
$PW_TERM ${optirun_on} "${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
else
"${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
$PW_TERM "${port_on_run}" "run" "explorer" >> "${PORT_WINE_PATH}/${portname}.log" 2>&1 &
fi
zenity --info --title "DEBUG" --text "${port_debug}" --no-wrap && "${WINESERVER}" -k
STOP_PORTWINE | pwzen
......
......@@ -3,5 +3,5 @@
. "$(dirname $(readlink -f "$0"))/runlib"
"${WINESERVER}" -k
START_PORTWINE
"${port_on_run}" "run" "regedit"
$PW_TERM "${port_on_run}" "run" "regedit"
STOP_PORTWINE
......@@ -7,10 +7,10 @@ if ! [ -z "${wine_pids}" ] ; then
kill -9 ${wine_pids}
fi
rm -f ${PORT_SCRIPTS_PATH}/winetricks
"/usr/bin/xterm" -e wget -T 3 --output-document="${PORT_SCRIPTS_PATH}/winetricks" https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
wget -T 3 --output-document=${PORT_SCRIPTS_PATH}/winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks
chmod +x "${PORT_SCRIPTS_PATH}/winetricks"
sed -i '18a . $(dirname $(readlink -f "$0"))/runlib\nSTART_PORTWINE\nexport WINELOADER="${WINEDIR}/bin/wine" ' "${PORT_SCRIPTS_PATH}/winetricks"
sleep 1
export PW_LOG=1
"/usr/bin/xterm" -e "sh ${PORT_SCRIPTS_PATH}/winetricks -q --force"
$PW_TERM "sh ${PORT_SCRIPTS_PATH}/winetricks -q --force"
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