Module: nagvis Branch: nagvis-1.4 Commit: 9086621a1285ee94f520387bbb29105eba1d970d URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=9086621a1285ee94f520387bbb29105eba1d970d
Author: Lars Michelsen <[email protected]> Date: Tue Aug 18 23:36:48 2009 +0200 Fixed Nagios version detection --- nagvis/install.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nagvis/install.sh b/nagvis/install.sh index 7f51dbb..b4a9f8d 100755 --- a/nagvis/install.sh +++ b/nagvis/install.sh @@ -595,12 +595,12 @@ line "Checking prerequisites" "+" [ -z "$NAGIOS_BIN" ]&&NAGIOS_BIN="$NAGIOS_PATH/bin/$SOURCE" if [ -f $NAGIOS_BIN ]; then - NAGIOS=`$NAGIOS_BIN --version | grep -iE "$SOURCE\s+" 2>&1` + NAGIOS=`$NAGIOS_BIN --version | grep -i "^$SOURCE\s" 2>&1` log "$NAGIOS" $NAGIOS else log "$SOURCE binary $NAGIOS_BIN" fi -NAGVER=`echo $NAGIOS | cut -d" " -f2 | cut -c1,1` +NAGVER=`echo $NAGIOS | cut -d" " -f3 | cut -c1,1` [ "$SOURCE" = "icinga" ]&&NAGVER=3 # Check Backend prerequisites ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
