Skip to content

fix: Use different approach for escaping only if an entry in $command ends with backslash #24

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
Nov 9, 2025
Merged

fix: Use different approach for escaping only if an entry in $command ends with backslash #24

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
16 changes: 11 additions & 5 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.4"
SCB_VER="1.2.5"

gamescope_opts=""
command=""
Expand Down Expand Up @@ -407,9 +407,15 @@ while [[ $# -gt 0 ]]; do
shift
# Add remaining args as individually double quoted args (should stop double quoting being a requirement)
while [[ $# -gt 0 ]]; do
# command variable has to be formated like this and $1 has to be escaped otherwise the %command% will not launch
# shellcheck disable=SC2089
command+=" \"$(printf "%q" "$1")\""
# Wrap each entry in %command% in quotes to make it easier for scripting
# Escape the last \ in $1 if the last character is \ otherwise the %command% will not launch
if [[ "$1" =~ \\$ ]]; then
# shellcheck disable=SC2089
command+=" \"$(echo "$1" | sed -E 's/\\$/\\\\/')\""
else
# shellcheck disable=SC2089
command+=" \"$1\""
fi
shift
done

Expand Down Expand Up @@ -679,7 +685,7 @@ else
LD_PRELOAD_REAL=$LD_PRELOAD

# Unset LD_PRELOAD for gamescope (as it breaks the overlay) then start gamescope with LD_PRELOAD set for %command% instead
LOGLINE="Launching: env -u LD_PRELOAD $GAMESCOPE_BIN $gamescope_opts -- env LD_PRELOAD=$LD_PRELOAD_REAL $command"
LOGLINE="Launching: env -u LD_PRELOAD $GAMESCOPE_BIN $gamescope_opts -- env LD_PRELOAD=\"$LD_PRELOAD_REAL\" $command"
echo "$LOGLINE"
if [ "$SCB_DEBUG" -eq 1 ]; then
SCB_LOGFILE="$SCB_CONFIGDIR/scopebuddy.log"
Expand Down