Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CompatTool add from setflatpak function #1152

Merged
merged 3 commits into from
Aug 28, 2024
Merged

Remove CompatTool add from setflatpak function #1152

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
178e6e2
Remove CompatTool add from setflatpak function
HanPrower Aug 28, 2024
4345783
Fix wrong case in getGameScopeGeneralOpts GSSHWRES
HanPrower Aug 28, 2024
e2aa2fa
Remove `FPBIN` and bump version to v14.0.20240828-1
HanPrower Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions steamtinkerlaunch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
PREFIX="/usr"
PROGNAME="SteamTinkerLaunch"
NICEPROGNAME="Steam Tinker Launch"
PROGVERS="v14.0.20240727-1"
PROGVERS="v14.0.20240828-1"
PROGCMD="${0##*/}"
PROGINTERNALPROTNAME="Proton-stl"
SHOSTL="stl"
Expand Down Expand Up @@ -153,7 +153,6 @@ F1ACTIONCG="bash -c setColGui"
BTS="backup-timestamp"
DUMMYBIN="echo"
STLAIDSIZE="12"
FPBIN="/app/utils/bin"
INFLATPAK=0
WDIB="wine-discord-ipc-bridge"
FIXGAMESCOPE=0
Expand Down Expand Up @@ -11315,7 +11314,7 @@ function setGameScopeVars {
function getGameScopeGeneralOpts {
# GameScope Show Resolution (corresponds to -W, -H options, uppercase) -- Actual GameScope window size -- Dropdown
if [ -z "$GSSHWRES" ]; then
if ! grep -qw "\-w" <<< "$GAMESCOPE_ARGS" || ! grep -qw "\-h" <<< "$GAMESCOPE_ARGS"; then
if ! grep -qw "\-W" <<< "$GAMESCOPE_ARGS" || ! grep -qw "\-H" <<< "$GAMESCOPE_ARGS"; then
GSSHWRES="1280x720"
else
GSSHWRES="$(tr ' ' '\n' <<< "$GAMESCOPE_ARGS" | grep -wA1 "\-W" | tail -n1)x$(tr ' ' '\n' <<< "$GAMESCOPE_ARGS" | grep -wA1 "\-H" | tail -n1)"
Expand Down Expand Up @@ -26878,7 +26877,6 @@ function setflatpak {
if [ -n "$FLATPAK_ID" ] && [ "$FLATPAK_ID" == "com.valvesoftware.Steam" ]; then
writelog "INFO" "${FUNCNAME[0]} - seems like flatpak is used, because variable 'FLATPAK_ID' exists and points to 'com.valvesoftware.Steam'"
INFLATPAK=1
CompatTool "add" "$FPBIN/$PROGCMD"
else
writelog "INFO" "${FUNCNAME[0]} - started $PROGNAME from ${0}"
fi
Expand Down