Re: [PATCH] test-lib.sh: use printf instead of echo
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 19, 2014, 17:17 UTC
- Message-ID
- <xmqqfvme5cql.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <20140318221844.GA828@google.com>
Jonathan Nieder <jrnieder@gmail.com> writes:
Show 13 quoted lines
> Junio C Hamano wrote: >>> Uwe Storbeck wrote: > >>>> + printf '%s\n' "$@" | sed -e 's/^/# /' >> >> This is wrong, isn't it? Why do we want one line per item here? > > Yes, Hannes caught the same, too. Sorry for the sloppiness. > > We currently use "echo" all over the place (e.g., 'echo "$path"' in > git-sh-setup), and every time we fix it there is a chance of making > mistakes. I wonder if it would make sense to add a helper to make the > echo calls easier to replace:
I agree that we would benefit from having a helper to print a single line, which we very often do, without having to worry about the boilerplate '%s\n' of printf or the portability gotcha of echo.
I am a bit reluctant to name the helper "sane_echo" to declare "echo that interprets backslashes in the string is insane", though. For these "print a single line" uses, we are only interested in using a subset of the features offered by 'echo', but that does not mean the other features we do not want to trigger in our use is of no use to any sane person. It very different from "sane_unset" that works around "unset" on an unset variable that can trigger an error when nobody sane is interested in that error condition. If somebody is interested if a variable is not yet set and behave differently, there are more direct ways to see the "set-ness" of a variable, and asking "unset" for that information is insane, hence I think the name "sane_unset" is justified. I do not feel the same way for "sane_echo".
I would have called it "say" if the name weren't taken.
Show 60 quoted lines
> -- >8 --
> Subject: git-sh-setup: introduce sane_echo helper
>
> Using 'echo' with arguments that might contain backslashes or "-e" or
> "-n" can produce confusing results that vary from platform to platform
> (e.g., dash always interprets \ escape sequences and echoes "-e"
> verbatim, whereas bash does not interpret \ escapes unless "-e" is
> passed as an argument to echo and suppresses the "-e" from its
> output).
>
> Instead, we should use printf, which is more predictable:
>
> printf '%s\n' "$foo"; # Just prints $foo, on all platforms.
>
> Blindly replacing echo with "printf '%s\n'" would not be good enough
> because that printf prints each argument on its own line. Provide a
> sane_echo helper that prints its arguments, space-delimited, on a
> single line, to make this easier to remember, and tweak 'say'
> and 'die_with_status' to illustrate how it is used.
>
> No functional change intended.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---
> git-sh-setup.sh | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git i/git-sh-setup.sh w/git-sh-setup.sh
> index 256c89a..f35b5b9 100644
> --- i/git-sh-setup.sh
> +++ w/git-sh-setup.sh
> @@ -43,6 +43,10 @@ git_broken_path_fix () {
>
> # @@BROKEN_PATH_FIX@@
>
> +sane_echo () {
> + printf '%s\n' "$*"
> +}
> +
> die () {
> die_with_status 1 "$@"
> }
> @@ -50,7 +54,7 @@ die () {
> die_with_status () {
> status=$1
> shift
> - printf >&2 '%s\n' "$*"
> + sane_echo >&2 "$*"
> exit "$status"
> }
>
> @@ -59,7 +63,7 @@ GIT_QUIET=
> say () {
> if test -z "$GIT_QUIET"
> then
> - printf '%s\n' "$*"
> + sane_echo "$*"
> fi
> }
>