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

extProtonRun: Use 'printf "%q"' when parsing RUNPROGARGS #1073

Merged
merged 3 commits into from
Mar 24, 2024
Merged

extProtonRun: Use 'printf "%q"' when parsing RUNPROGARGS #1073

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
695751e
extProtonRun: Use 'printf "%q"' when parsing RUNPROGARGS
sonic2kk Mar 23, 2024
1a477b9
extProtonRun: Handle custom command arguments with spaces
sonic2kk Mar 23, 2024
7751878
version bump
sonic2kk Mar 24, 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
29 changes: 27 additions & 2 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.20240323-1"
PROGVERS="v14.0.20240325-1"
PROGCMD="${0##*/}"
PROGINTERNALPROTNAME="Proton-stl"
SHOSTL="stl"
Expand Down Expand Up @@ -7079,12 +7079,37 @@ function extProtonRun {
if [ -z "$PROGARGS" ] || [ "$PROGARGS" == "$NON" ]; then
RUNPROGARGS=""
else
mapfile -d " " -t -O "${#RUNPROGARGS[@]}" RUNPROGARGS < <(printf '%s' "$PROGARGS")
mapfile -d " " -t -O "${#TMP_RUNPROGARGS[@]}" TMP_RUNPROGARGS < <( printf "%q" "$PROGARGS" )

# Basically check for and join paths that contain spaces because above mapfile will strip them
# TODO: This does NOT work with paths that use forward slashes
for i in "${!TMP_RUNPROGARGS[@]}"; do
# Remove trailing backslash, i.e. turn `--launch\` into `--launch`
TMP_RUNPROGARGS[i]="${TMP_RUNPROGARGS[i]%\\}"

# If the last seen element in the array ended with a backslash, assume
# this is an incomplete path and join them
#
# This is not perfect as valid paths that just end with backslashes will not work,
# but we can document this on the wiki
#
# i.e. "Z:\this\is\a\path\ MY_VAR=2" will not work, but "Z:\this\is\a\path MY_VAR=2" will work
if [[ $LASTRUNPROGARG = *"\\" ]]; then
# Remove 'i-1' (previous element), because 'i' (current element) will contain 'i-1'
unset "TMP_RUNPROGARGS[i-1]"
TMP_RUNPROGARGS[i]="${LASTRUNPROGARG} ${TMP_RUNPROGARGS[i]}"
fi
LASTRUNPROGARG="${TMP_RUNPROGARGS[i]}"
done

# Generate new array with null strings removed.
mapfile -t -O "${#RUNPROGARGS[@]}" RUNPROGARGS < <( printf "%s\n" "${TMP_RUNPROGARGS[@]}" | grep -v "^$" )
fi

FWAIT=2

# mirrors above RUNPROGARGS
# TODO what if we try to pass paths with spaces? This could be problematic here...
if [ -z "$EXTPROGRAMARGS" ]; then
writelog "INFO" "${FUNCNAME[0]} - No external program args here it seems"
RUNEXTPROGRAMARGS=( "" )
Expand Down