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

Jump to bottom

updateConfigEntry: Pass sed an escaped CFGVALUE #1076

Merged
merged 4 commits into from
Mar 25, 2024
Merged

updateConfigEntry: Pass sed an escaped CFGVALUE #1076

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b1f9a8
updateConfigEntry: Pass sed an escaped CFGVALUE
sonic2kk Mar 24, 2024
61bb84b
updateConfigEntry: Move declaration for ESCAPED_CFGVALUE
sonic2kk Mar 24, 2024
f0cf6fa
version change
sonic2kk Mar 24, 2024
015ee2e
version bump
sonic2kk Mar 25, 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
12 changes: 9 additions & 3 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.20240325-1"
PROGVERS="v14.0.20240325-2"
PROGCMD="${0##*/}"
PROGINTERNALPROTNAME="Proton-stl"
SHOSTL="stl"
Expand Down Expand Up @@ -10945,18 +10945,24 @@ function updateConfigEntry {
CFGVALUE=""
fi

# Help prevent expanding incoming config values by escaping them (i.e. when using with sed)
ESCAPED_CFGVALUE="$( printf "%s\n" "$CFGVALUE" | sed 's/\\/\\\\/g' )"

# only save value if it changed
# sed needs escaped string because otherwise it'll expand escape sequences in strings with backslashes
# i.e. config values with Windows paths, '\home\test' will have '\t' expanded as a tab character
# We have to use the regular one for echo though.
if { [ "${!CFGCAT}" != "$CFGVALUE" ] && [ "${!CFGCAT}" != "${CFGVALUE//$STLCFGDIR/STLCFGDIR}" ];} || [ -f "$FUPDATE" ]; then
CFGVALUE="${CFGVALUE//$STLCFGDIR/STLCFGDIR}"
if [ "$(grep -c "#${CFGCAT}=" "$CFGFILE")" -eq 1 ]; then
writelog "INFO" "${FUNCNAME[0]} - Option '$CFGCAT' commented out in config '${CFGFILE##*/}' - activating it with the new value '$CFGVALUE'"
sed -i "/^#${CFGCAT}=/c$CFGCAT=\"$CFGVALUE\"" "$CFGFILE"
sed -i "/^#${CFGCAT}=/c$CFGCAT=\"$ESCAPED_CFGVALUE\"" "$CFGFILE"
elif [ "$(grep -c "^${CFGCAT}=" "$CFGFILE")" -eq 0 ]; then
writelog "INFO" "${FUNCNAME[0]} - '$CFGCAT' option missing in config '${CFGFILE##*/}' - adding a new line"
echo "$CFGCAT=\"$CFGVALUE\"" >> "$CFGFILE"
else
writelog "INFO" "${FUNCNAME[0]} - Option '$CFGCAT' is updated with the new value '$CFGVALUE' in config '${CFGFILE##*/}'"
sed -i "/^${CFGCAT}=/c$CFGCAT=\"$CFGVALUE\"" "$CFGFILE"
sed -i "/^${CFGCAT}=/c$CFGCAT=\"$ESCAPED_CFGVALUE\"" "$CFGFILE"
fi
rm "$FUPDATE" 2>/dev/null
fi
Expand Down