From 819693ae5ce5bcb168fe5fbfda62373f28ec914b Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sat, 27 May 2023 21:14:12 +0100 Subject: [PATCH 1/7] Reaper: Respect reaper toggle and kill reaper process --- steamtinkerlaunch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index ed32bb86..0676912a 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230526-3" +PROGVERS="v14.0.20230528-1 (reaper-kill)" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" @@ -19268,13 +19268,14 @@ function setSLRReap { fi fi fi - - if [ "$HAVEREAP" -eq 1 ] && [ "$USEREAP" -eq 1 ]; then - writelog "INFO" "${FUNCNAME[0]} - ## reaper command is enabled via USEREAP=$USEREAP - prepending to the current launch command" - SLRCMD=("${REAPCMD[@]}" "${SLRCMD[@]}") - elif [ "$HAVEREAP" -eq 0 ] && [ "$USEREAP" -eq 1 ] && [ -n "$LASTREAP" ] && [ -f "$LASTREAP" ] && [ "$FORCEREAP" -eq 1 ]; then - writelog "INFO" "${FUNCNAME[0]} - ## No reaper command provided from command line, but FORCEREAP is $FORCEREAP, so prepending LASTREAP '$LASTREAP' to the current launch command" - SLRCMD=("$LASTREAP" "SteamLaunch" "AppId=$AID" "--" "${SLRCMD[@]}") + + # Reaper is started *by Steam now* after a game launch (i.e. after %command% but *not* before) + # so if reaper is disabled we have to check for and kill it + if [ "$USEREAP" -eq 0 ]; then + if "$PGREP" -x "reaper"; then + writelog "INFO" "${FUNCNAME[0]} - USEREAP is '$USEREAP' and found reaper process, killing it!" + "$PKILL" -9 "reaper" + fi fi if [ -n "${SLRCMD[0]}" ]; then From e351d9d7c2bd4227e6e6a847317cc9d40d7abc58 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 28 May 2023 18:41:56 +0100 Subject: [PATCH 2/7] Reaper: Remove FORCEREAP This option is no longer applicable. --- lang/chinese.txt | 2 -- lang/dutch.txt | 2 -- lang/english.txt | 2 -- lang/englishUK.txt | 2 -- lang/french.txt | 2 -- lang/german.txt | 2 -- lang/italian.txt | 2 -- lang/polish.txt | 2 -- lang/russian.txt | 2 -- steamtinkerlaunch | 6 +----- 10 files changed, 1 insertion(+), 23 deletions(-) diff --git a/lang/chinese.txt b/lang/chinese.txt index 756d1be3..f88142d4 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -811,8 +811,6 @@ DESC_SPEKVERS="Special K下载版本。" NOTY_MISSDLL="'XXX'需要'YYY'，这在目前运行的'ZZZ'的WINEPREFIX中是不存在的" GUI_FORCESLR="强制使用Steam Linux Runtime" DESC_FORCESLR="强制使用Steam Linux Runtime 如果无法使用" -GUI_FORCEREAP="强制执行reaper命令" -DESC_FORCEREAP="强制执行reaper命令，如果不可用" GUI_CUPROTOCOMPAT="在 compatibilitytools.d 中提取自定义Proton" DESC_CUPROTOCOMPAT="在 compatibilitytools.d 中提取自定义Proton" GUI_RUN_VORTEX_WINETRICKS="在 Vortex 模式下启用 Winetricks" diff --git a/lang/dutch.txt b/lang/dutch.txt index 02eb3b2a..a9d56fcd 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -807,8 +807,6 @@ DESC_SPEKVERS="Special K download version" NOTY_MISSDLL="'XXX' requires 'YYY', which is not available in the WINEPREFIX currently running with 'ZZZ'" GUI_FORCESLR="Force Steam Linux Runtime" DESC_FORCESLR="Force Steam Linux Runtime if not available" -GUI_FORCEREAP="Force reaper command" -DESC_FORCEREAP="Force reaper command if not available" GUI_CUPROTOCOMPAT="Uitpakken aangepaste Proton archieven in compatibilitytools.d" DESC_CUPROTOCOMPAT="Uitpakken aangepaste Proton archieven in compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Enable Winetricks in Vortex Mode" diff --git a/lang/english.txt b/lang/english.txt index 9aba39d2..06be86af 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -811,8 +811,6 @@ DESC_SPEKVERS="Special K download version" NOTY_MISSDLL="'XXX' requires 'YYY', which is not available in the WINEPREFIX currently running with 'ZZZ'" GUI_FORCESLR="Force Steam Linux Runtime" DESC_FORCESLR="Force Steam Linux Runtime if not available" -GUI_FORCEREAP="Force reaper command" -DESC_FORCEREAP="Force reaper command if not available" GUI_CUPROTOCOMPAT="Extract custom Proton in compatibilitytools.d" DESC_CUPROTOCOMPAT="Extract custom Proton in compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Enable Winetricks in Vortex Mode" diff --git a/lang/englishUK.txt b/lang/englishUK.txt index 04f21494..2e866059 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -807,8 +807,6 @@ DESC_SPEKVERS="Special K download version" NOTY_MISSDLL="'XXX' requires 'YYY', which is not available in the WINEPREFIX currently running with 'ZZZ'" GUI_FORCESLR="Force Steam Linux Runtime" DESC_FORCESLR="Force Steam Linux Runtime if not available" -GUI_FORCEREAP="Force reaper command" -DESC_FORCEREAP="Force reaper command if not available" GUI_CUPROTOCOMPAT="Extract custom Proton in compatibilitytools.d" DESC_CUPROTOCOMPAT="Extract custom Proton in compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Enable Winetricks in Vortex Mode" diff --git a/lang/french.txt b/lang/french.txt index c119a77e..89ad7d9a 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -807,8 +807,6 @@ DESC_SPEKVERS="Version de téléchargement de Special K" NOTY_MISSDLL="'XXX' nécessite 'YYY', qui n'est pas disponible dans le WINEPREFIX actuellement utilisé avec 'ZZZ'" GUI_FORCESLR="Forcer Steam Linux Runtime" DESC_FORCESLR="Forcer Steam Linux Runtime si non disponible" -GUI_FORCEREAP="Forcer la commande reaper" -DESC_FORCEREAP="Force la commande reaper si non disponible" GUI_CUPROTOCOMPAT="Extraire Proton custom dans compatibilitytools.d" DESC_CUPROTOCOMPAT="Extraire Proton custom dans compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Activer Winetricks dans le Vortex mode" diff --git a/lang/german.txt b/lang/german.txt index 6ab5a25c..0f041520 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -807,8 +807,6 @@ DESC_SPEKVERS="Special K download Version" NOTY_MISSDLL="'XXX' benötigt 'YYY', welches im WINEPREFIX der gerade verwendeten Proton Version 'ZZZ' nicht verfügbar ist" GUI_FORCESLR="Erzwinge Steam Linux Runtime" DESC_FORCESLR="Erzwinge Steam Linux Runtime falls nicht verfügbar" -GUI_FORCEREAP="Erzwinge reaper Befehl" -DESC_FORCEREAP="Erzwinge reaper Befehl falls nicht verfügbar" GUI_CUPROTOCOMPAT="Entpacke custom Proton nach compatibilitytools.d" DESC_CUPROTOCOMPAT="Entpacke custom Proton nach compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Starte Winetricks vor Vortex" diff --git a/lang/italian.txt b/lang/italian.txt index 6dcf8b7b..487903c0 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -807,8 +807,6 @@ DESC_SPEKVERS="Scarica versione Special K" NOTY_MISSDLL="'XXX' richiede 'YYY', che non è disponibile in WINEPREFIX dove è in esecuzione con 'ZZZ'" GUI_FORCESLR="Forza Steam Linux Runtime" DESC_FORCESLR="Forza Steam Linux Runtime se non disponibile" -GUI_FORCEREAP="Forza il comando reaper" -DESC_FORCEREAP="Forza il comando reaper se è non disponibile" GUI_CUPROTOCOMPAT="Estrazione di archivi personalizzati di Proton in compatibilitytools.d" DESC_CUPROTOCOMPAT="Estrazione di archivi personalizzati di Proton in compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Enable Winetricks in Vortex Mode" diff --git a/lang/polish.txt b/lang/polish.txt index 4ed5ba5e..55484571 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -807,8 +807,6 @@ DESC_SPEKVERS="Wersja pobrana Special K" NOTY_MISSDLL="'XXX' wymaga 'YYY', które nie jest dostępne w WINEPREFIX obecnie uruchamianym z 'ZZZ'" GUI_FORCESLR="Wymuś Steam Linux Runtime" DESC_FORCESLR="Wymuś Steam Linux Runtime, jeśli nie dostępne" -GUI_FORCEREAP="Wymuś polecenia reaper" -DESC_FORCEREAP="Wymuś polecenia reaper, jeśli nie dostępne" GUI_CUPROTOCOMPAT="Wypakowanie własnych archiwów Protona do compatibilitytools.d" DESC_CUPROTOCOMPAT="Wypakowanie własnych archiwów Protona do compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Włącz Winetricks w trybie Vortex" diff --git a/lang/russian.txt b/lang/russian.txt index 933af779..250bd4d5 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -807,8 +807,6 @@ DESC_SPEKVERS="Special K download version" NOTY_MISSDLL="'XXX' requires 'YYY', which is not available in the WINEPREFIX currently running with 'ZZZ'" GUI_FORCESLR="Заставить Steam Linux Runtime" DESC_FORCESLR="Заставить Steam Linux Runtime если опция не доступна" -GUI_FORCEREAP="Заставить reaper command" -DESC_FORCEREAP="Заставить reaper command если опция не доступна" GUI_CUPROTOCOMPAT="Распаковка архивов альтернативных сборок Proton в compatibilitytools.d" DESC_CUPROTOCOMPAT="Распаковка архивов альтернативных сборок Proton в compatibilitytools.d" GUI_RUN_VORTEX_WINETRICKS="Enable Winetricks in Vortex Mode" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 0676912a..d1f07592 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230528-1 (reaper-kill)" +PROGVERS="v14.0.20230529-1 (reaper-kill)" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" @@ -2699,7 +2699,6 @@ function setDefaultCfgValues { if [ -z "$USESLR" ] ; then USESLR="1"; fi if [ -z "$FORCESLR" ] ; then FORCESLR="0"; fi if [ -z "$USEREAP" ] ; then USEREAP="1"; fi - if [ -z "$FORCEREAP" ] ; then FORCEREAP="0"; fi if [ -z "$USEPROTON" ] ; then USEPROTON="$(getDefaultProton)"; fi if [ -z "$REDIRCOMPDATA" ] ; then REDIRCOMPDATA="disabled"; fi if [ -z "$REDIRSTEAMUSER" ] ; then REDIRSTEAMUSER="disabled"; fi @@ -3205,8 +3204,6 @@ function saveCfg { echo "FORCESLR=\"$FORCESLR\"" echo "## $DESC_USEREAP" echo "USEREAP=\"$USEREAP\"" - echo "## $DESC_FORCEREAP" - echo "FORCEREAP=\"$FORCEREAP\"" echo "## $DESC_USEPROTON" echo "USEPROTON=\"$USEPROTON\"" echo "## $DESC_REDIRCOMPDATA" @@ -5124,7 +5121,6 @@ function AllSettingsEntriesDummyFunction { --field=" $GUI_USESLR!$DESC_USESLR ('USESLR')":CHK "${USESLR/#-/ -}" `#CAT_Proton` `#SUB_Checkbox` `#MENU_GAME` \ --field=" $GUI_FORCESLR!$DESC_FORCESLR ('FORCESLR')":CHK "${FORCESLR/#-/ -}" `#CAT_Proton` `#SUB_Checkbox` `#MENU_GAME` \ --field=" $GUI_USEREAP!$DESC_USEREAP ('USEREAP')":CHK "${USEREAP/#-/ -}" `#CAT_Proton` `#SUB_Checkbox` `#MENU_GAME` \ ---field=" $GUI_FORCEREAP!$DESC_FORCEREAP ('FORCEREAP')":CHK "${FORCEREAP/#-/ -}" `#CAT_Proton` `#SUB_Checkbox` `#MENU_GAME` \ --field=" $GUI_AUTOLASTPROTON!$DESC_AUTOLASTPROTON ('AUTOLASTPROTON')":CHK "${AUTOLASTPROTON/#-/ -}" `#CAT_Proton` `#SUB_Checkbox` `#MENU_GLOBAL` \ --field=" $GUI_REDIRCOMPDATA!$DESC_REDIRCOMPDATA ('REDIRCOMPDATA')":CB "$(cleanDropDown "${REDIRCOMPDATA/#-/ -}" "disabled!single-proton!global-proton")" `#CAT_Proton` `#MENU_GAME` \ --field=" $GUI_REDIRSTEAMUSER!$DESC_REDIRSTEAMUSER ('REDIRSTEAMUSER')":CB "$(cleanDropDown "${REDIRSTEAMUSER/#-/ -}" "disabled!symlink!restore-backup")" `#CAT_Proton` `#MENU_GAME` \ From ccd9ea9b1f2121b5c27ed004e799db413f302e2e Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 28 May 2023 18:45:01 +0100 Subject: [PATCH 3/7] Reaper: Remove HAVEREAP This variable was used to set/append reaper from the Steam launch command, but reaper no longer comes from the Steam launch command, so these checks are useless now (except for users who may be using a criminally outdated Steam version). --- steamtinkerlaunch | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index d1f07592..839d1e02 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -1923,14 +1923,6 @@ function setGameVars { # this should cover it though as well already APPMAFE="$(listAppManifests | grep -m1 "${1}.acf")" fi - - REAPSESTR="reaper SteamLaunch" - - if grep -q "$REAPSESTR" <<< "$@"; then - HAVEREAP=1 - else - HAVEREAP=0 - fi if grep -q "$SLR" <<< "$@"; then HAVESLR=1 @@ -1950,30 +1942,6 @@ function setGameVars { mapfile -t -O "${#INGCMD[@]}" INGCMD <<< "$INGARG" done <<< "$(printf "%s\n" "$@")" - # then put the reaper command into an array, as it is the first command in the line - if [ "$HAVEREAP" -eq 1 ]; then - FOUNDREAP=0 - while read -r INGARG; do - if [ "$FOUNDREAP" -eq 0 ]; then - mapfile -t -O "${#REAPCMD[@]}" REAPCMD <<< "$INGARG" - if [ "$INGARG" == "--" ]; then - FOUNDREAP=1 - fi - else - mapfile -t -O "${#WIPAGCMD[@]}" WIPAGCMD <<< "$INGARG" - fi - done <<< "$(printf "%s\n" "${INGCMD[@]}")" - else - while read -r INGARG; do - mapfile -t -O "${#WIPAGCMD[@]}" WIPAGCMD <<< "$INGARG" - done <<< "$(printf "%s\n" "${INGCMD[@]}")" - fi - THISREAP="${REAPCMD[*]}" - THISREAP="${THISREAP% SteamLaunch*}" - if [ -z "$LASTREAP" ] || { [ -n "$LASTREAP" ] && [ "$LASTREAP" != "$THISREAP" ];}; then - updateConfigEntry "LASTREAP" "$THISREAP" "$STLDEFGLOBALCFG" - fi - # if the SLR is called from command line put it into an array as well if [ "$HAVESLR" -eq 1 ]; then FOUNDSLR=0 @@ -18248,7 +18216,6 @@ function fixCustomMeta { function initPlay { HAVESLR=0 HAVESLRCT=0 - HAVEREAP=0 HAVESCTP=0 INCOPATH=0 STLPLAY=1 @@ -19626,18 +19593,9 @@ function launchSteamGame { echo "I '${INGCMD[*]}'" echo "X '${FINALSTARTCMD[*]}'" echo "$(date) - $GN ($AID) - ======================" - if [ "$HAVESCTP" -eq 0 ] && [ "$HAVEREAP" -eq 0 ]; then - echo "$(date) - $GN ($AID) - HAVESCTP='$HAVESCTP', and HAVEREAP='$HAVEREAP' - assuming ${PROGNAME,,} is used as compat tool - using regular base game command to continue" - elif [ "$HAVESCTP" -eq 0 ] && [ "$HAVEREAP" -eq 1 ]; then - echo "$(date) - $GN ($AID) - HAVESCTP='$HAVESCTP', but also HAVEREAP='$HAVEREAP' - assuming ${PROGNAME,,} is set to both command and compat tool (or compat tool is empty) - steam doesn't provide STEAM_COMPAT_TOOL_PATHS, so have to cut out the reaper line to continue; HAVESLR='$HAVESLR'" - elif [ "$HAVESCTP" -eq 1 ] && [ "$HAVEREAP" -eq 1 ]; then - echo "$(date) - $GN ($AID) - HAVESCTP='$HAVESCTP', and HAVEREAP='$HAVEREAP' - assuming $PROGCMD is used as command line tool - switching proton version is disabled" - elif [ "$HAVESCTP" -eq 1 ] && [ "$HAVEREAP" -eq 0 ]; then - echo "$(date) - $GN ($AID) - HAVESCTP='$HAVESCTP', but also HAVEREAP='$HAVEREAP' - something went wrong - never seen this in the wild" - fi echo "$(date) - $GN ($AID) - ======================" echo "$(date) - $GN ($AID) - INITIAL LAUNCH COMAND '${INGCMD[*]}'" - echo "$(date) - $GN ($AID) - HAVESCTP='$HAVESCTP';HAVEREAP='$HAVEREAP';HAVESLR='$HAVESLR';HAVESLRCT='$HAVESLRCT';HAVEINPROTON='$HAVEINPROTON'" + echo "$(date) - $GN ($AID) - HAVESCTP='$HAVESCTP';HAVESLR='$HAVESLR';HAVESLRCT='$HAVESLRCT';HAVEINPROTON='$HAVEINPROTON'" echo "$(date) - $GN ($AID) - REAPCMD '${REAPCMD[*]}'" echo "$(date) - $GN ($AID) - RUNSLR '${RUNSLR[*]}'" echo "$(date) - $GN ($AID) - RUNSLRCT '${RUNSLRCT[*]}'" From 9936f1ed582d6d4681e496b55b64bd4d01e54be8 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 28 May 2023 19:10:09 +0100 Subject: [PATCH 4/7] Reaper: Rework checkbox wording; remove some unused adjacent SLR code --- lang/english.txt | 2 +- steamtinkerlaunch | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lang/english.txt b/lang/english.txt index 06be86af..03778073 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -723,7 +723,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="Enable FSR (OpenVR)" DESC_USEOPENVRFSR="Enable FidelityFX Super Resolution (FSR) compatible OpenVR" GUI_USEREAP="Use reaper command" -DESC_USEREAP="Use reaper command if available" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Fix symlinks" DESC_FIXSYMLINKS="Fix symlinks pointing to a Proton version unlike the current one" GUI_UNSYMLINK="Unsymlink" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 839d1e02..c9074f9d 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230529-1 (reaper-kill)" +PROGVERS="v14.0.20230529-REFACTOR-EXPERIMENT (reaper-kill)" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" @@ -1942,7 +1942,13 @@ function setGameVars { mapfile -t -O "${#INGCMD[@]}" INGCMD <<< "$INGARG" done <<< "$(printf "%s\n" "$@")" + # This was part of reaper code, may not be needed anymore + while read -r INGARG; do + mapfile -t -O "${#WIPAGCMD[@]}" WIPAGCMD <<< "$INGARG" + done <<< "$(printf "%s\n" "${INGCMD[@]}")" + # if the SLR is called from command line put it into an array as well + ## NOTE 28/05/23 - May not be needed anymore? if [ "$HAVESLR" -eq 1 ]; then FOUNDSLR=0 while read -r ORGARG; do @@ -17983,11 +17989,6 @@ function startGame { writelog "INFO" "${FUNCNAME[0]} - Rebuilding STEAM_COMPAT_TOOL_PATHS variable:" writelog "INFO" "${FUNCNAME[0]} - Adding RUNPROTON '${RUNPROTON%/*}'" STEAM_COMPAT_TOOL_PATHS="${RUNPROTON%/*}" - if [ "$HAVESCTP" -eq 1 ] && [ "$USESLR" -eq 1 ]; then - RUNSLA="${RUNSLR[0]}" - writelog "INFO" "${FUNCNAME[0]} - Adding '${RUNSLA%/*}' because USESLR is enabled" - STEAM_COMPAT_TOOL_PATHS="$STEAM_COMPAT_TOOL_PATHS:${RUNSLA%/*}" - fi writelog "INFO" "${FUNCNAME[0]} - Result: Set STEAM_COMPAT_TOOL_PATHS from '$ORG_STEAM_COMPAT_TOOL_PATHS' to '$STEAM_COMPAT_TOOL_PATHS'" elif [ "$RUNFORCESLR" -eq 1 ]; then writelog "INFO" "${FUNCNAME[0]} - Rebuilding STEAM_COMPAT_TOOL_PATHS variable, because SLR was forced" From f823a35e437e5a82483eb7ecedff500103a55aaa Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 28 May 2023 19:16:09 +0100 Subject: [PATCH 5/7] update langfiles --- lang/chinese.txt | 2 +- lang/dutch.txt | 2 +- lang/englishUK.txt | 2 +- lang/french.txt | 2 +- lang/german.txt | 2 +- lang/italian.txt | 2 +- lang/polish.txt | 2 +- lang/russian.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lang/chinese.txt b/lang/chinese.txt index f88142d4..0dfbd909 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -723,7 +723,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="启用FSR(OpenVR)" DESC_USEOPENVRFSR="启用FidelityFX超级分辨率(FSR)兼容OpenVR" GUI_USEREAP="使用reaper命令" -DESC_USEREAP="如果可用，使用 reaper 命令" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="修复符号链接" DESC_FIXSYMLINKS="修复指向与当前版本不同的 Proton 版本的符号链接" GUI_UNSYMLINK="取消符号链接" diff --git a/lang/dutch.txt b/lang/dutch.txt index a9d56fcd..6046db6d 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -719,7 +719,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="Enable FSR (OpenVR)" DESC_USEOPENVRFSR="Enable FidelityFX Super Resolution (FSR) compatible OpenVR" GUI_USEREAP="Use reaper command" -DESC_USEREAP="Use reaper command if available" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Fix symlinks" DESC_FIXSYMLINKS="Fix symlinks pointing to a Proton version unlike the current one" GUI_UNSYMLINK="Unsymlink" diff --git a/lang/englishUK.txt b/lang/englishUK.txt index 2e866059..c47c050f 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -719,7 +719,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="Enable FSR (OpenVR)" DESC_USEOPENVRFSR="Enable FidelityFX Super Resolution (FSR) compatible OpenVR" GUI_USEREAP="Use reaper command" -DESC_USEREAP="Use reaper command if available" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Fix symlinks" DESC_FIXSYMLINKS="Fix symlinks pointing to a Proton version unlike the current one" GUI_UNSYMLINK="Unsymlink" diff --git a/lang/french.txt b/lang/french.txt index 89ad7d9a..800117f6 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -719,7 +719,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="Activer FSR (OpenVR)" DESC_USEOPENVRFSR="Activer la FidelityFX Super Resolution (FSR) compatible OpenVR" GUI_USEREAP="Utiliser la commande reaper" -DESC_USEREAP="Utiliser la commande reaper si disponible" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Corriger les liens symboliques" DESC_FIXSYMLINKS="Corriger les liens symboliques pointant vers une version de Proton différente de la version actuelle" GUI_UNSYMLINK="Supprimer le lien symbolique" diff --git a/lang/german.txt b/lang/german.txt index 0f041520..122bc174 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -719,7 +719,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="Verwende FSR (OpenVR)" DESC_USEOPENVRFSR="Verwende FidelityFX Super Resolution (FSR) kompatibles OpenVR" GUI_USEREAP="Verwende reaper Befehl" -DESC_USEREAP="Verwende reaper Befehl falls verfügbar" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Repariere symlinks" DESC_FIXSYMLINKS="Repariere symlinks die auf eine andere Proton Version als die gerade verwendete zeigen" GUI_UNSYMLINK="Unsymlink" diff --git a/lang/italian.txt b/lang/italian.txt index 487903c0..74da012a 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -719,7 +719,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="Abilita FSR (OpenVR)" DESC_USEOPENVRFSR="Abilita FidelityFX Super Resolution (FSR) compatibile OpenVR" GUI_USEREAP="Usa il comando reaper" -DESC_USEREAP="Usa il comando reaper se è disponibile" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Ripara symlinks" DESC_FIXSYMLINKS="Ripara i symlinks che puntano a una versione di proton diversa da quella attuale" GUI_UNSYMLINK="Unsymlink" diff --git a/lang/polish.txt b/lang/polish.txt index 55484571..364744f8 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -719,7 +719,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Własna rozdzielczość do FST, z której GUI_USEOPENVRFSR="Włącz FSR (OpenVR)" DESC_USEOPENVRFSR="Włącz OpenVR kompatybilny z FidelityFX Super Resolution (FSR)" GUI_USEREAP="Użyj polecenia reaper" -DESC_USEREAP="Użyj polecenia reaper jeśli dostępne" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Napraw linki symboliczne" DESC_FIXSYMLINKS="Napraw linki symboliczne wskazując na wersję Protona inną niż obecna" GUI_UNSYMLINK="Usuń link symboliczny" diff --git a/lang/russian.txt b/lang/russian.txt index 250bd4d5..40caf404 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -719,7 +719,7 @@ DESC_WINE_FULLSCREEN_FSR_CUSTOM_MODE="Custom resolution for FSR to upscale from. GUI_USEOPENVRFSR="Enable FSR (OpenVR)" DESC_USEOPENVRFSR="Enable FidelityFX Super Resolution (FSR) compatible OpenVR" GUI_USEREAP="Use reaper command" -DESC_USEREAP="Use reaper command if available" +DESC_USEREAP="Allow Steam to run the Reaper process at startup (default behaviour with regular Steam launch) - disabling this may allow forked processes to stay open after game close, but disable this option with caution" GUI_FIXSYMLINKS="Fix symlinks" DESC_FIXSYMLINKS="Fix symlinks pointing to a proton version unlike the current one" GUI_UNSYMLINK="Unsymlink" From a6e07f3347dd6d9c7ec0ba031c5898229196364e Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 28 May 2023 19:16:25 +0100 Subject: [PATCH 6/7] minor version change --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index c9074f9d..bee2faf6 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230529-REFACTOR-EXPERIMENT (reaper-kill)" +PROGVERS="v14.0.20230529-9 (reaper-kill)" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" From c72a4586309e70a9b4093d9b683d402ed51e9c66 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 28 May 2023 19:21:17 +0100 Subject: [PATCH 7/7] formatting --- steamtinkerlaunch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 10f709e6..bb961794 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -6,7 +6,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20230529-9 (reaper-kill)" +PROGVERS="v14.0.20230529-10 (reaper-kill)" PROGCMD="${0##*/}" SHOSTL="stl" GHURL="https://github.com" @@ -19342,6 +19342,8 @@ function setSLRReap { fi fi + + # Set Reaper command (currently no way to toggle this if we call setSLRReap for non-game launches, doesn't seem to have any negative impact though?) # --------------- # Reaper is started *by Steam now* after a game launch (i.e. after %command% but *not* before) @@ -19351,9 +19353,11 @@ function setSLRReap { writelog "INFO" "${FUNCNAME[0]} - USEREAP is '$USEREAP' and found reaper process, killing it!" "$PKILL" -9 "reaper" fi - fi + fi # --------------- + + if [ -n "${SLRCMD[0]}" ]; then writelog "INFO" "${FUNCNAME[0]} - Adding SLR '${SLRCMD[*]}' to the launch command" fi