packages: nagios/nagios.init - improved configtest output

[glen]

Author: glen                         Date: Sat Jul 25 19:29:21 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- improved configtest output

---- Files affected:
packages/nagios:
   nagios.init (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/nagios/nagios.init
diff -u packages/nagios/nagios.init:1.20 packages/nagios/nagios.init:1.21
--- packages/nagios/nagios.init:1.20	Sat Jul 25 21:18:04 2009
+++ packages/nagios/nagios.init	Sat Jul 25 21:29:16 2009
@@ -41,9 +41,16 @@
 
 	if [ $details = 1 ]; then
 		# run config test and display report (status action)
-		show "Checking %s configuration" "Nagios"; busy; echo
-		configtest
+		show "Checking %s configuration" "Nagios"; busy
+		local out
+		out=`configtest 2>&1`
 		RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			ok
+		else
+			fail
+			echo >&2 "$out"
+		fi
 	else
 		# run config test and abort with nice message if failed
 		# (for actions checking status before action).
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/nagios.init?r1=1.20&r2=1.21&f=u