diff options
author | maya <maya@pkgsrc.org> | 2021-06-25 22:02:06 +0000 |
---|---|---|
committer | maya <maya@pkgsrc.org> | 2021-06-25 22:02:06 +0000 |
commit | 8275c29b2e3e625f2cd627850710403a1f4f3b13 (patch) | |
tree | f33257a68e04cb25a2c5d4e87ed59fe52c6004d5 /mk/wrapper | |
parent | 8782a47950cab4cd4a663ea12876af2cf8530406 (diff) | |
download | pkgsrc-8275c29b2e3e625f2cd627850710403a1f4f3b13.tar.gz |
switch $echo statements to printf "%s\n".
dash considers \1 to be octal escape.
for PR pkg/56248, from Michael Forney's suggestion.
$echo seems to be used for performance here (was previously cat) and not
for compatibility with some esoteric system.
I misunderstood things, and failed to test the last bootstrap diff, breaking
bootstrap on Ubuntu for a while.
Diffstat (limited to 'mk/wrapper')
-rw-r--r-- | mk/wrapper/gen-transform.sh | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/mk/wrapper/gen-transform.sh b/mk/wrapper/gen-transform.sh index 9041aa33573..589a8b2a82d 100644 --- a/mk/wrapper/gen-transform.sh +++ b/mk/wrapper/gen-transform.sh @@ -1,6 +1,6 @@ #! @WRAPPER_SHELL@ # -# $NetBSD: gen-transform.sh,v 1.12 2018/08/22 20:48:37 maya Exp $ +# $NetBSD: gen-transform.sh,v 1.13 2021/06/25 22:02:06 maya Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,7 +33,6 @@ shell_lib="@_WRAP_SHELL_LIB@" wrapperlog="${WRAPPER_LOG-@_WRAP_LOG@}" debug="${WRAPPER_DEBUG-no}" -echo="@ECHO@" test="@TEST@" . $shell_lib @@ -135,16 +134,16 @@ gen() case $_action in transform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|^$1\(/[^$_sep]*\.la[$_sep]\)|$2\1|g" - $echo "s|^$1\(/[^$_sep]*\.la\)$|$2\1|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\.la[$_sep]\)|$2\1|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\.la\)$|$2\1|g" ;; untransform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|\([$_sep]\)$1\(/[^$_sep]*\.la[$_sep]\)|\1$2\2|g" - $echo "s|\([$_sep]\)$1\(/[^$_sep]*\.la[$_sep]\)|\1$2\2|g" - $echo "s|\([$_sep]\)$1\(/[^$_sep]*\.la\)$|\1$2\2|g" - $echo "s|^$1\(/[^$_sep]*\.la[$_sep]\)|$2\1|g" - $echo "s|^$1\(/[^$_sep]*\.la\)$|$2\1|g" + printf "%s\n" "s|\([$_sep]\)$1\(/[^$_sep]*\.la[$_sep]\)|\1$2\2|g" + printf "%s\n" "s|\([$_sep]\)$1\(/[^$_sep]*\.la[$_sep]\)|\1$2\2|g" + printf "%s\n" "s|\([$_sep]\)$1\(/[^$_sep]*\.la\)$|\1$2\2|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\.la[$_sep]\)|$2\1|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\.la\)$|$2\1|g" ;; esac ;; @@ -197,16 +196,16 @@ gen() case $_action in transform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|^$1\([$_sep]\)|$2\1|g" - $echo "s|^$1$|$2|g" + printf "%s\n" "s|^$1\([$_sep]\)|$2\1|g" + printf "%s\n" "s|^$1$|$2|g" ;; untransform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|\([$_sep]\)$1\([$_sep]\)|\1$2\2|g" - $echo "s|\([$_sep]\)$1\([$_sep]\)|\1$2\2|g" - $echo "s|\([$_sep]\)$1$|\1$2|g" - $echo "s|^$1\([$_sep]\)|$2\1|g" - $echo "s|^$1$|$2|g" + printf "%s\n" "s|\([$_sep]\)$1\([$_sep]\)|\1$2\2|g" + printf "%s\n" "s|\([$_sep]\)$1\([$_sep]\)|\1$2\2|g" + printf "%s\n" "s|\([$_sep]\)$1$|\1$2|g" + printf "%s\n" "s|^$1\([$_sep]\)|$2\1|g" + printf "%s\n" "s|^$1$|$2|g" ;; esac ;; @@ -227,16 +226,16 @@ gen() case $_action in transform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|^$1\(/[^$_sep]*\)$2\([$_sep]\)|$3\1$4|g" - $echo "s|^$1\(/[^$_sep]*\)$2$|$3\1$4|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\)$2\([$_sep]\)|$3\1$4|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\)$2$|$3\1$4|g" ;; untransform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|\([$_sep]\)$1\(/[^$_sep]*\)$2\([$_sep]\)|\1$3\2$4\3|g" - $echo "s|\([$_sep]\)$1\(/[^$_sep]*\)$2\([$_sep]\)|\1$3\2$4\3|g" - $echo "s|\([$_sep]\)$1\(/[^$_sep]*\)$2$|\1$3\2$4|g" - $echo "s|^$1\(/[^$_sep]*\)$2\([$_sep]\)|$3\1$4|g" - $echo "s|^$1\(/[^$_sep]*\)$2$|$3\1$4|g" + printf "%s\n" "s|\([$_sep]\)$1\(/[^$_sep]*\)$2\([$_sep]\)|\1$3\2$4\3|g" + printf "%s\n" "s|\([$_sep]\)$1\(/[^$_sep]*\)$2\([$_sep]\)|\1$3\2$4\3|g" + printf "%s\n" "s|\([$_sep]\)$1\(/[^$_sep]*\)$2$|\1$3\2$4|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\)$2\([$_sep]\)|$3\1$4|g" + printf "%s\n" "s|^$1\(/[^$_sep]*\)$2$|$3\1$4|g" ;; esac ;; @@ -282,16 +281,16 @@ gen() case $_action in transform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|^$1[^$_sep]*\([$_sep]\)|\1|g" - $echo "s|^$1[^$_sep]*$||g" + printf "%s\n" "s|^$1[^$_sep]*\([$_sep]\)|\1|g" + printf "%s\n" "s|^$1[^$_sep]*$||g" ;; untransform) $debug_log $wrapperlog " (gen-transform) $_cmd: $@" - $echo "s|\([$_sep]\)$1[^$_sep]*\([$_sep]\)|\1\2|g" - $echo "s|\([$_sep]\)$1[^$_sep]*\([$_sep]\)|\1\2|g" - $echo "s|\([$_sep]\)$1[^$_sep]*$|\1|g" - $echo "s|^$1[^$_sep]*\([$_sep]\)|\1|g" - $echo "s|^$1[^$_sep]*$||g" + printf "%s\n" "s|\([$_sep]\)$1[^$_sep]*\([$_sep]\)|\1\2|g" + printf "%s\n" "s|\([$_sep]\)$1[^$_sep]*\([$_sep]\)|\1\2|g" + printf "%s\n" "s|\([$_sep]\)$1[^$_sep]*$|\1|g" + printf "%s\n" "s|^$1[^$_sep]*\([$_sep]\)|\1|g" + printf "%s\n" "s|^$1[^$_sep]*$||g" ;; esac ;; |