From c460cda91c67d3e59d95458f0e2d4798fe6e7a61 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 21 Apr 2024 01:23:13 +0100 Subject: [PATCH 1/6] Game Menu: Add option to disable Native Linux Steam Linux Runtime coming from Compatibility Tool If a native game is launched with a Steam Linux Runtime Compatibility Tool selected, either by the user or Valve Testing, the Steam Linux Runtime will come in the game launch command. However a user may want to ignore this for any reason, so this adds a checkbox to allow users to ignore the incoming Steam Linux Runtime and let SteamTinkerLaunch find it. --- lang/english.txt | 4 +++- steamtinkerlaunch | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lang/english.txt b/lang/english.txt index 0748cd9d..00cc01cd 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -234,7 +234,7 @@ TRAY_TOOLTIP="RMB=Menu, LBM/MMB=Exit" TRAY_PAUSE="Pause/unpause active window in 5 seconds" # SINCE "v2.4.0" GUI_USESLR="Use Steam Linux Runtime" -DESC_USESLR="Use Steam Linux Runtime requested by compatibility tool, if available - May need to be manually from Steam if unavailable" +DESC_USESLR="Use Steam Linux Runtime requested by compatibility tool, if available - May need to be manually installed from Steam if unavailable" # SINCE "v2.4.1" # SINCE "v2.4.2" GUI_USEWINDECO="Use window decoration (requires restart)" @@ -1279,3 +1279,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 7479c6e8..b37c03b6 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240420-1" +PROGVERS="v14.0.20240421-1 (ignore-compat-tool-slr)" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -3187,6 +3187,7 @@ function setDefaultCfgValues { if [ -z "$KEEPSTLOPEN" ] ; then KEEPSTLOPEN="0"; fi if [ -z "$USESLR" ] ; then USESLR="1"; fi if [ -z "$FORCESLR" ] ; then FORCESLR="0"; fi + if [ -z "$IGNORECOMPATSLR" ] ; then IGNORECOMPATSLR="0"; fi if [ -z "$USEREAP" ] ; then USEREAP="1"; fi if [ -z "$FORCEREAP" ] ; then FORCEREAP="0"; fi if [ -z "$USEPROTON" ] ; then USEPROTON="$(getDefaultProton)"; fi @@ -3765,6 +3766,8 @@ function saveCfg { echo "USESLR=\"$USESLR\"" echo "## $DESC_FORCESLR" echo "FORCESLR=\"$FORCESLR\"" + echo "## $DESC_IGNORECOMPATSLR" + echo "IGNORECOMPATSLR=\"$IGNORECOMPATSLR\"" echo "## $DESC_USEREAP" echo "USEREAP=\"$USEREAP\"" echo "## $DESC_FORCEREAP" @@ -5707,6 +5710,7 @@ function AllSettingsEntriesDummyFunction { --field=" $GUI_USEPROTON!$DESC_USEPROTON ('USEPROTON')":CB "$(cleanDropDown "${USEPROTON/#-/ -}" "$PROTYADLIST")" `#CAT_Proton` `#MENU_GAME` \ --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_IGNORECOMPATSLR!$DESC_IGNORECOMPATSLR ('IGNORECOMPATSLR')":CHK "${IGNORECOMPATSLR/#-/ -}" `#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` \ @@ -21130,7 +21134,7 @@ function setSLRReap { # # In this case, we want to take the SLR given to us by the compatibility tool and use that # HAVESLRCT=1 will only be true if the SLR is coming from the compatibility tool - if [ "$HAVESLRCT" -eq 1 ] && [ "$USESLR" -eq 1 ]; then + if [ "$HAVESLRCT" -eq 1 ] && [ "$USESLR" -eq 1 ] && [ "$IGNORECOMPATSLR" -eq 0 ]; then writelog "INFO" "${FUNCNAME[0]} - ## SLR is enabled via USESLR=$USESLR - prepending SLR from Compatibility Tool to the current launch command" writelog "INFO" "${FUNCNAME[0]} - ## This can happen if a game is running with a Steam Linux Runtime compatibility tool enabled" SLRCMD=("${RUNSLRCT[@]}") @@ -21147,6 +21151,12 @@ function setSLRReap { writelog "INFO" "${FUNCNAME[0]} - ## SLR is enabled via USESLR=$USESLR - prepending SLR from command line to the current launch command" writelog "INFO" "${FUNCNAME[0]} - RUNSLR is '${RUNSLR[*]}'" SLRCMD=("${RUNSLR[@]}") + # If the user enables "IGNORECOMPATSLR", disable HAVESLR so that the below logic for Pressure Vessel Funtime will kick in and fetch the SLR manually + elif [ "$HAVESLRCT" -eq 1 ] && [ "$USESLR" -eq 1 ] && [ "$IGNORECOMPATSLR" -eq 1 ]; then + writelog "INFO" "${FUNCNAME[0]} - ## SLR was found in incoming Start Command, likely from a compatibility tool, but 'IGNORECOMPATSLR' is '${IGNORECOMPATSLR}'" + writelog "INFO" "${FUNCNAME[0]} - ## Ignoring this incoming SLR from the selected Steam Linux Runtime Compatibility Tool and instead letting SteamTinkerLaunch find the Steam Linux Runtime instead" + writelog "WARN" "${FUNCNAME[0]} - ## Note that some games require a specific Steam Linux Runtime version, and if a given Steam Linux Runtime version that SteamTinkerLaunch looks for is not found, or if the version found does not match what a game might require, launching may fail" + HAVESLR=0 fi # Legacy case to ignore SLR gotten from commandline @@ -21157,6 +21167,7 @@ function setSLRReap { # SLR fetching (from toolmanifest.vdf / native Linux SLR AppID) # --------------- + # TODO This could probably be refactored to have less indentation and return early... RUNFORCESLR=0 if [[ ( "$HAVESLR" -eq 0 && "$USESLR" -eq 1 ) || -n "$OVERRIDESLR" ]]; then if [ -n "$LASTSLR" ] && [ -f "${LASTSLR% --verb*}" ] && [ "$FORCESLR" -eq 1 ]; then From 16927c9253d3be2c03a383b528e53fff73fa42e4 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 21 Apr 2024 02:31:32 +0100 Subject: [PATCH 2/6] update langfiles --- lang/chinese.txt | 2 ++ lang/dutch.txt | 2 ++ lang/english.txt | 2 ++ lang/englishUK.txt | 6 +++++- lang/french.txt | 2 ++ lang/german.txt | 2 ++ lang/italian.txt | 2 ++ lang/polish.txt | 2 ++ lang/russian.txt | 2 ++ steamtinkerlaunch | 4 +++- 10 files changed, 24 insertions(+), 2 deletions(-) diff --git a/lang/chinese.txt b/lang/chinese.txt index 2376d30c..4b726d96 100644 --- a/lang/chinese.txt +++ b/lang/chinese.txt @@ -1280,3 +1280,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/dutch.txt b/lang/dutch.txt index 17adb63d..fc7cb809 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1277,3 +1277,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/english.txt b/lang/english.txt index 00cc01cd..d416174c 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -1281,3 +1281,5 @@ GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/englishUK.txt b/lang/englishUK.txt index 1d065319..607be228 100644 --- a/lang/englishUK.txt +++ b/lang/englishUK.txt @@ -230,7 +230,7 @@ TRAY_TOOLTIP="RMB=Menu, LBM/MMB=Exit" TRAY_PAUSE="Pause/unpause active window in 5 seconds" # SINCE "v2.4.0" GUI_USESLR="Use Steam Linux Runtime" -DESC_USESLR="Use Steam Linux Runtime requested by compatibility tool, if available - May need to be manually from Steam if unavailable" +DESC_USESLR="Use Steam Linux Runtime requested by compatibility tool, if available - May need to be manually installed from Steam if unavailable" # SINCE "v2.4.1" # SINCE "v2.4.2" GUI_USEWINDECO="Use window decoration (requires restart)" @@ -1279,3 +1279,7 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/french.txt b/lang/french.txt index 8d87e783..bfc31b9e 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -1278,3 +1278,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/german.txt b/lang/german.txt index b9e9e922..6f0f66f6 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -1281,3 +1281,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/italian.txt b/lang/italian.txt index 2dddd124..b73e38f6 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1279,3 +1279,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/polish.txt b/lang/polish.txt index a1e2cd22..c036a07e 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -1279,3 +1279,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/lang/russian.txt b/lang/russian.txt index 96d2bfaf..019ce261 100644 --- a/lang/russian.txt +++ b/lang/russian.txt @@ -1279,3 +1279,5 @@ NOTY_FSGDBAW="Fetching SteamGridDB Artwork for 'XXX'" NOTY_FSGDBAWINVALID="Cannot fetch SteamGridDB Artwork, must provide AppID, Game ID, or Game Name!" GUI_GSMOUSESENSITIVITY="Mouse Sensitivity" DESC_GSMOUSESENSITIVITY="configurable mouse sensitivity, multiply mouse movement by specified decimal number amount" +GUI_IGNORECOMPATSLR="Ignore Native Linux Steam Linux Runtime from Compatibility Tool" +DESC_IGNORECOMPATSLR="ignore Steam Linux Runtime for native games selected either by you or by Valve Testing as a Compatibility Tool and let SteamTinkerLaunch find it instead. For example, ignore Steam Linux Runtime 3.0 selected by Valve Testing and let SteamTinkerLaunch find and use Steam Linux Runtime 1.0 instead. This can have MAJOR impacts on compatibility, and has NO EFFECT for games using Proton" diff --git a/steamtinkerlaunch b/steamtinkerlaunch index b37c03b6..babc10a4 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240421-1 (ignore-compat-tool-slr)" +PROGVERS="v14.0.20240421-2 (ignore-compat-tool-slr)" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -21152,10 +21152,12 @@ function setSLRReap { writelog "INFO" "${FUNCNAME[0]} - RUNSLR is '${RUNSLR[*]}'" SLRCMD=("${RUNSLR[@]}") # If the user enables "IGNORECOMPATSLR", disable HAVESLR so that the below logic for Pressure Vessel Funtime will kick in and fetch the SLR manually + # HAVESLR controls whether we Have an SLR coming from the incoming command line options, which is nowadays only really the case for native titles with a Compat Tool forced/selected by Valve Testing elif [ "$HAVESLRCT" -eq 1 ] && [ "$USESLR" -eq 1 ] && [ "$IGNORECOMPATSLR" -eq 1 ]; then writelog "INFO" "${FUNCNAME[0]} - ## SLR was found in incoming Start Command, likely from a compatibility tool, but 'IGNORECOMPATSLR' is '${IGNORECOMPATSLR}'" writelog "INFO" "${FUNCNAME[0]} - ## Ignoring this incoming SLR from the selected Steam Linux Runtime Compatibility Tool and instead letting SteamTinkerLaunch find the Steam Linux Runtime instead" writelog "WARN" "${FUNCNAME[0]} - ## Note that some games require a specific Steam Linux Runtime version, and if a given Steam Linux Runtime version that SteamTinkerLaunch looks for is not found, or if the version found does not match what a game might require, launching may fail" + HAVESLR=0 fi From b4d4de445f93301d17c9c500b5b2ed6138fb054f Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 21 Apr 2024 02:38:11 +0100 Subject: [PATCH 3/6] version bump --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index babc10a4..d38a6bc2 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240421-2 (ignore-compat-tool-slr)" +PROGVERS="v14.0.20240421-3" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" From 69de1d3df9305cb41011840cb1ddefed0aa699c4 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 21 Apr 2024 02:50:35 +0100 Subject: [PATCH 4/6] version bump mainly testing CI tbh... --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index d38a6bc2..8854a6f6 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240421-3" +PROGVERS="v14.0.20240422-1" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" From c3916a7c183f5ce95c406402650eec8d4031e224 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 21 Apr 2024 03:04:15 +0100 Subject: [PATCH 5/6] CI: version change --- steamtinkerlaunch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 8854a6f6..2f30690f 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240422-1" +PROGVERS="v14.0.20240422-1 (ignore-compat-tool-slr)" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" From ac5c9506a31339e272457de7647a375263c2d269 Mon Sep 17 00:00:00 2001 From: Eamonn Rea Date: Sun, 21 Apr 2024 04:44:16 +0100 Subject: [PATCH 6/6] version bump --- steamtinkerlaunch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/steamtinkerlaunch b/steamtinkerlaunch index 2f30690f..879ecdff 100755 --- a/steamtinkerlaunch +++ b/steamtinkerlaunch @@ -7,7 +7,7 @@ PREFIX="/usr" PROGNAME="SteamTinkerLaunch" NICEPROGNAME="Steam Tinker Launch" -PROGVERS="v14.0.20240422-1 (ignore-compat-tool-slr)" +PROGVERS="v14.0.20240421-1" PROGCMD="${0##*/}" PROGINTERNALPROTNAME="Proton-stl" SHOSTL="stl" @@ -21147,7 +21147,7 @@ function setSLRReap { # - SLR comes from the selected compatibility tool (e.g. if a user selects SLR 1.0 for a native game, or if one is selected for them) # - SLR comes from the game start command even if no compat tool is used (should not happen anymore, legacy Steam behaviour) # - SLR is not given to us *at all*, so we use the SLR fetching below - elif [ "$HAVESLR" -eq 1 ] && [ "$USESLR" -eq 1 ]; then + elif [ "$HAVESLR" -eq 1 ] && [ "$USESLR" -eq 1 ] && [ "$IGNORECOMPATSLR" -eq 0 ]; then writelog "INFO" "${FUNCNAME[0]} - ## SLR is enabled via USESLR=$USESLR - prepending SLR from command line to the current launch command" writelog "INFO" "${FUNCNAME[0]} - RUNSLR is '${RUNSLR[*]}'" SLRCMD=("${RUNSLR[@]}")