diff options
| author |  Holger Weiss <holger@zedat.fu-berlin.de>
| 2014-01-13 22:55:43 +0100 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de>
| 2014-01-13 22:55:43 +0100 |
| commit | 9db763963f3993f923619a2147e4313b09f12134 (patch) | |
| tree | 7de03645f44f5b5ec42bb8894b0c5b3165196e25 /plugins-scripts/utils.sh.in | |
| parent | 20b598da6ee238a608c17524c4483fea1b14a4fa (diff) | |
| download | monitoring-plugins-9db763963f3993f923619a2147e4313b09f12134.tar.gz | |
utils.sh: Don't define $ECHO
In utils.sh, $ECHO was set to printf(1) or echo(1), depending on whether
printf(1) is available in /usr/bin. This resulted in various bugs, as
printf(1) cannot be used in the same way as echo(1).
Thanks to Trevor Hemsley for reporting one of those bugs: If $ECHO was
set to printf(1), check_log stumbled when reporting a log line with a
"%" character.
Diffstat (limited to 'plugins-scripts/utils.sh.in')
| -rw-r--r-- | plugins-scripts/utils.sh.in | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in index 4a07df89..031c0357 100644 --- a/plugins-scripts/utils.sh.in +++ b/plugins-scripts/utils.sh.in @@ -6,19 +6,13 @@ STATE_CRITICAL=2 STATE_UNKNOWN=3 STATE_DEPENDENT=4 -if test -x /usr/bin/printf; then - ECHO=/usr/bin/printf -else - ECHO=echo -fi - print_revision() { echo "$1 v$2 (@PACKAGE@ @VERSION@)" - $ECHO "@WARRANTY@" | sed -e 's/\n/ /g' + printf '%b' "@WARRANTY@" } support() { - $ECHO "@SUPPORT@" | sed -e 's/\n/ /g' + printf '%b' "@SUPPORT@" } # |