Skip to content

fix: preserve trailing newlines in unchanged --set literals #770

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

Open
fuleinist wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: preserve trailing newlines in unchanged --set literals #770

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
7 changes: 6 additions & 1 deletion scripts/commands/helm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,12 @@ helm_wrapper() {
fatal 'Unable to decrypt literal value %s' "${literal}"
fi

if [ "${decrypted_literal}" = "${literal}" ]; then

# Command substitution $( ) strips trailing newlines, so a literal ending in a newline
# will never equal its decrypted value (both the same plain-text string, but lengths differ).
# Comparing length via printf+wc-c distinguishes unchanged values from values that only
# lost a trailing newline due to shell expansion.
if [ "${decrypted_literal}" = "${literal}" ] && [ "$(printf "%s" "${decrypted_literal}" | wc -c)" -eq "$(printf "%s" "${literal}" | wc -c)" ]; then
decrypted_literals="${decrypted_literals}${opt_prefix}${decrypted_literal},"
else
decrypted_literals="${decrypted_literals}${opt_prefix}$(printf '%s' "${decrypted_literal}" | sed -e 's/\\/\\\\/g' | sed -e 's/,/\\,/g'),"
Expand Down
Loading