Skip to content

P
PortWINE
Commit 46c7364c authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

Merge branch 'ananicy' of github.com:Boria138/PortWINE into Boria138-ananicy

parents 70d61c08 55e2fac6
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 39 deletions
data_from_portwine/scripts/functions_helper
View file @ 46c7364c
...@@ -2716,45 +2716,58 @@ start_portwine () { ...@@ -2716,45 +2716,58 @@ start_portwine () {
export int_xneur=1 export int_xneur=1
fi fi
if check_gamescope_session ; then if check_gamescope_session ; then
export PW_GAMEMODERUN_SLR="" export PW_GAMEMODERUN_SLR=""
elif [[ "$PW_USE_GAMEMODE" = "1" ]] \ elif [[ "$PW_USE_GAMEMODE" = "1" ]] && [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]]; then
&& [[ -n "$DBUS_SESSION_BUS_ADDRESS" ]] if systemctl is-active --quiet ananicy.service || systemctl is-active --quiet ananicy-cpp.service; then
then export GAMEMODERUN=0
if command -v gamemoded &>/dev/null ; then export PW_GAMEMODERUN_SLR=""
export GAMEMODERUN=1
PW_GAMEMODERUN_SLR="gamemoderun" if command -v powerprofilesctl &>/dev/null ; then
systemctl enable --now --user gamemoded &>/dev/null if powerprofilesctl list | grep -q 'performance:'; then
print_info "Gamemod will be launched." export PW_POWERPROFILECTL_SLR="powerprofilesctl launch -p performance --"
elif check_flatpak ; then print_info "Gamemode replaced by powerprofilectl to avoid conflict with ananicy."
export GAMEMODERUN=1 else
PW_GAMEMODERUN_SLR="gamemoderun" export PW_POWERPROFILECTL_SLR=""
print_info "Gamemod will be launched." fi
elif [[ "$PW_USE_RUNTIME" == 1 ]] ; then fi
export GAMEMODERUN=1 else
if ! pidof gamemoded &>/dev/null ; then if command -v gamemoded &>/dev/null ; then
GAMEMODEAUTO_NAME="libgamemodeauto.so.0" export GAMEMODERUN=1
if [[ -n "${PW_LD_PRELOAD}" ]] PW_GAMEMODERUN_SLR="gamemoderun"
then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${GAMEMODEAUTO_NAME}" systemctl enable --now --user gamemoded &>/dev/null
else export PW_LD_PRELOAD="${GAMEMODEAUTO_NAME}" print_info "Gamemode will be launched."
fi elif check_flatpak ; then
export GAMEMODERUN=1
env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" \ PW_GAMEMODERUN_SLR="gamemoderun"
"${PW_PLUGINS_PATH}/portable/bin/gamemoded" &>/dev/null & print_info "Gamemode will be launched."
elif [[ "$PW_USE_RUNTIME" == 1 ]] ; then
print_info "Gamemod will be launched." export GAMEMODERUN=1
sleep 0.1 if ! pidof gamemoded &>/dev/null ; then
fi GAMEMODEAUTO_NAME="libgamemodeauto.so.0"
else if [[ -n "${PW_LD_PRELOAD}" ]]; then
export GAMEMODERUN=0 export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${GAMEMODEAUTO_NAME}"
export PW_GAMEMODERUN_SLR="" else
fi export PW_LD_PRELOAD="${GAMEMODEAUTO_NAME}"
else fi
export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR="" env LD_LIBRARY_PATH="${PW_PLUGINS_PATH}/portable/lib/lib64:${PW_PLUGINS_PATH}/portable/lib/lib32" \
print_info "Gamemod is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE" "${PW_PLUGINS_PATH}/portable/bin/gamemoded" &>/dev/null &
fi
pw_other_fixes print_info "Gamemode will be launched."
sleep 0.1
fi
else
export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR=""
print_info "Gamemode is not installed or disabled in vars script or db file: PW_USE_GAMEMODE=$PW_USE_GAMEMODE"
fi
fi
else
export GAMEMODERUN=0
export PW_GAMEMODERUN_SLR=""
fi
pw_other_fixes
# enabled BattleEye_Runtime and EasyAntiCheat_Runtime # enabled BattleEye_Runtime and EasyAntiCheat_Runtime
if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then if [[ "${PW_USE_EAC_AND_BE}" == 1 ]] ; then
...@@ -3576,6 +3589,7 @@ pw_run () { ...@@ -3576,6 +3589,7 @@ pw_run () {
echo "" echo ""
print_info "Log from RUNTIME and WINE:" print_info "Log from RUNTIME and WINE:"
${PW_RUN_GAMESCOPE} \ ${PW_RUN_GAMESCOPE} \
${PW_POWERPROFILECTL_SLR} \
${pw_runtime} \ ${pw_runtime} \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \
...@@ -3593,6 +3607,7 @@ pw_run () { ...@@ -3593,6 +3607,7 @@ pw_run () {
echo "" echo ""
echo "Log WINE:" > "${PW_LOG_TO_FILE}" echo "Log WINE:" > "${PW_LOG_TO_FILE}"
${PW_RUN_GAMESCOPE} \ ${PW_RUN_GAMESCOPE} \
${PW_POWERPROFILECTL_SLR} \
${pw_runtime} \ ${pw_runtime} \
LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \
LD_PRELOAD="${PW_LD_PRELOAD}" \ LD_PRELOAD="${PW_LD_PRELOAD}" \
...@@ -3625,6 +3640,7 @@ pw_run () { ...@@ -3625,6 +3640,7 @@ pw_run () {
VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \ VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \
${PW_RUN_GAMESCOPE} \ ${PW_RUN_GAMESCOPE} \
${PW_GAMEMODERUN_SLR} \ ${PW_GAMEMODERUN_SLR} \
${PW_POWERPROFILECTL_SLR} \
${PW_MANGOHUD_SLR} \ ${PW_MANGOHUD_SLR} \
${PW_DISPLAY} \ ${PW_DISPLAY} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}"
...@@ -3642,6 +3658,7 @@ pw_run () { ...@@ -3642,6 +3658,7 @@ pw_run () {
VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \ VK_INSTANCE_LAYERS="${PW_VK_INSTANCE_LAYERS}" \
${PW_RUN_GAMESCOPE} \ ${PW_RUN_GAMESCOPE} \
${PW_GAMEMODERUN_SLR} \ ${PW_GAMEMODERUN_SLR} \
${PW_POWERPROFILECTL_SLR} \
${PW_MANGOHUD_SLR} \ ${PW_MANGOHUD_SLR} \
${PW_DISPLAY} \ ${PW_DISPLAY} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]}
......
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