diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | plugins-scripts/check_log.sh | 11 | ||||
| -rw-r--r-- | plugins-scripts/utils.sh.in | 10 |
3 files changed, 8 insertions, 14 deletions
@@ -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 diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh index a1bfb486..ca5810ab 100755 --- a/plugins-scripts/check_log.sh +++ b/plugins-scripts/check_log.sh @@ -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 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@" } # |