upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-06-09 08:42:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

utils.sh: Don't define $ECHO

Browse source 
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.
This commit is contained in:
Holger Weiss 2014-01-13 22:55:43 +01:00
parent 20b598da6e
commit 9db763963f
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -3,6 +3,7 @@ This file documents the major additions and syntax changes between releases.
1.6 ...
WARNINGS
check_procs now ignores its parent process to avoid unexpected results when invoked via certain shells
utils.sh no longer defines ECHO
1.5 2nd October 2013
ENHANCEMENTS

11
plugins-scripts/check_log.sh
View file

@ -60,7 +60,6 @@
# TV: removed PATH restriction. Need to think more about what this means overall
#PATH=""
ECHO="/bin/echo"
GREP="/bin/egrep"
DIFF="/bin/diff"
TAIL="/bin/tail"
@ -167,10 +166,10 @@ done
# If the source log file doesn't exist, exit
if [ ! -e $logfile ]; then
$ECHO "Log check error: Log file $logfile does not exist!\n"
echo "Log check error: Log file $logfile does not exist!"
exit $STATE_UNKNOWN
elif [ ! -r $logfile ] ; then
$ECHO "Log check error: Log file $logfile is not readable!\n"
echo "Log check error: Log file $logfile is not readable!"
exit $STATE_UNKNOWN
fi
@ -180,7 +179,7 @@ fi
if [ ! -e $oldlog ]; then
$CAT $logfile > $oldlog
$ECHO "Log check data initialized...\n"
echo "Log check data initialized..."
exit $STATE_OK
fi
@ -209,10 +208,10 @@ $RM -f $tempdiff
$CAT $logfile > $oldlog
if [ "$count" = "0" ]; then # no matches, exit with no error
$ECHO "Log check ok - 0 pattern matches found\n"
echo "Log check ok - 0 pattern matches found"
exitstatus=$STATE_OK
else # Print total matche count and the last entry we found
$ECHO "($count) $lastentry"
echo "($count) $lastentry"
exitstatus=$STATE_CRITICAL
fi

10
plugins-scripts/utils.sh.in
View file

@ -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@"
}
#