X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=nagcollect.git;a=blobdiff_plain;f=client%2Fbin%2Fnagcollecttest;h=94df17a5c95e7cf273d2d5715bba3c19eef1fa5e;hp=4bcba08f81923d29c0e145d12ac5a1e834516153;hb=ad66976e79c7d292b250a9148c85835e5d93c096;hpb=1db2414a5f27bf29b8870e01524eba6aa260d622

diff --git a/client/bin/nagcollecttest b/client/bin/nagcollecttest
index 4bcba08..94df17a 100755
--- a/client/bin/nagcollecttest
+++ b/client/bin/nagcollecttest
@@ -11,15 +11,20 @@
 #
 
 NAME=`basename "$0"`
+VERBOSE=
 MAXTIME=300
 
+if [ "$1" = "-v" ]; then
+	VERBOSE=1
+	shift
+fi
 if [ $# -ne 1 ]; then
-	echo "Usage: $NAME <scriptname>"
-	exit 2
+	echo "Usage: $NAME [-v] <scriptname>"
+	exit 3
 fi
 if [ `id -u` -ne 0 ]; then
 	echo "$NAME must be run as root!"
-	exit 2
+	exit 3
 fi
 
 if [ -r /usr/local/lib/nagcollect/"$1.tst" ]; then
@@ -28,15 +33,25 @@ elif [ -r /usr/local/lib/nagcollect/`uname`/"$1.tst" ]; then
 	tst=/usr/local/lib/nagcollect/`uname`/"$1.tst"
 else
 	echo "$NAME: script \"$1\" not found!"
-	exit 2
+	exit 3
 fi
 
 SERVICE=""; STATUS=""; TEXT=""
-echo "Checking \"$tst\" ..."
+[ -n "$VERBOSE" ] && echo "Checking \"$tst\" ..."
 . "$tst"
 
-[ -n "$STATUS" -o -n "$TEXT" ] \
-	&& echo "RESULT: $SERVICE=$STATUS \"$TEXT\"" \
-	|| echo "NO result ..."
+if [ "$VERBOSE" ]; then
+	[ -n "$STATUS" -o -n "$TEXT" ] \
+		&& echo "RESULT: $SERVICE=$STATUS \"$TEXT\"" \
+		|| echo "NO result ..."
+else
+	[ -n "$TEXT" ] \
+		&& echo "$TEXT" \
+		|| echo "$NAME: \"$1\" returned no result?"
+fi
+
+[ -n "$STATUS" ] \
+	&& exit "$STATUS" \
+	|| exit 3
 
 # -eof-