Skip to content

fix: Remove the possibility of users footgunning themselves with the steam integration flag #20

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

Merged
HikariKnight merged 1 commit into from
Oct 29, 2025
Merged

fix: Remove the possibility of users footgunning themselves with the steam integration flag #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 21 additions & 7 deletions bin/scopebuddy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -eo pipefail
##########
# Globals
##########
SCB_VER="1.2.2"
SCB_VER="1.2.3"

gamescope_opts=""
command=""
Expand Down Expand Up @@ -51,9 +51,6 @@ SCB_APPENDMODE=${SCB_APPENDMODE:-0}
# Set APPID used for current game config
SCB_APPID=${SCB_APPID:-}

# By default we will never be in gamemode
SCB_GAMEMODE=0

# Default off for SCB_DEBUG
SCB_DEBUG=${SCB_DEBUG:-0}

Expand All @@ -64,9 +61,19 @@ SCB_AUTO_VRR=${SCB_AUTO_VRR:-0}
SCB_AUTO_REFRESH=${SCB_AUTO_REFRESH:-0}
SCB_AUTO_FRAME_LIMIT=${SCB_AUTO_FRAME_LIMIT:-0}

# We want to ignore -e and --steam gamescope flags as they are currently broken and crash gamescope
SCB_STEAMARGIGNORE=${SCB_STEAMARGIGNORE:-1}

############
# Constants
############
# By default we will never be in gamemode
SCB_GAMEMODE=0

# Helper to determine get if any of the SCB_AUTO_* features are enabled
# 0 = none enabled, >0 means at least one is enabled
SCB_ANY_AUTO_FEAT_ENABLED=$(( SCB_AUTO_RES + SCB_AUTO_HDR + SCB_AUTO_VRR + SCB_AUTO_REFRESH + SCB_AUTO_FRAME_LIMIT ))

###################
# Helper functions
###################
Expand Down Expand Up @@ -409,9 +416,16 @@ while [[ $# -gt 0 ]]; do
# Exit loop when done
break
fi
# Add arg to gamescope_opts and go to next loop
gamescope_opts+=" $1"
shift

# If the steam arg ignore function is enabled, ignore the -e and --steam flag in gamescope
if [ "$1" == "-e" ] || [ "$1" == "--steam" ] && [ "$SCB_STEAMARGIGNORE" == "1" ]; then
echo "Ignoring $1 flag for gamescope as it is currently broken"
shift
else
# Add arg to gamescope_opts and go to next loop
gamescope_opts+=" $1"
shift
fi
done

# If $SCB_APPID is not set, attempt to auto detect APPID for Steam
Expand Down