Module: nagvis Branch: nagvis-1.4 Commit: f3cc60e9e1f9ed888151b9564910c2c41ac4ed7f URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=f3cc60e9e1f9ed888151b9564910c2c41ac4ed7f
Author: Lars Michelsen <[email protected]> Date: Tue Aug 18 22:02:54 2009 +0200 #72,#73: Fixed some problems with latest version compatibility changes --- nagvis/install.sh | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/nagvis/install.sh b/nagvis/install.sh index d2d39b1..bf9fa2d 100755 --- a/nagvis/install.sh +++ b/nagvis/install.sh @@ -30,7 +30,7 @@ ############################################################################### # Installer version -INSTALLER_VERSION="0.2.2" +INSTALLER_VERSION="0.2.3" # Default action INSTALLER_ACTION="install" # Be quiet? (Enable/Disable confirmations) @@ -451,12 +451,30 @@ makedir() { # Main program starting ############################################################################### +# More (re)initialisations + +# Version info +NAGVIS_TAG=`fmt_version "$NAGVIS_VER"` +# Default Nagios path +NAGIOS_PATH="/usr/local/$SOURCE" +# Default Path to NagVis base +NAGVIS_PATH="/usr/local/nagvis" +[ $NAGVIS_TAG -lt 01050000 ]&&NAGVIS_PATH="$NAGIOS_PATH/share/nagvis" +# Default nagios share webserver path +HTML_PATH="/nagvis" +[ $NAGVIS_TAG -lt 01050000 ]&&HTML_PATH="/$SOURCE/nagvis" +HTML_BASE=$HTML_PATH + # Process command line options if [ $# -gt 0 ]; then while getopts "n:B:m:p:u:b:g:c:i:s:ohqv" options; do case $options in n) NAGIOS_PATH=$OPTARG + + # NagVis below 1.5 depends on the given Nagios path + # So set it here when some given by param + [ $NAGVIS_TAG -lt 01050000 ]&&NAGVIS_PATH="${NAGIOS_PATH%/}/share/nagvis" ;; B) NAGIOS_BIN=$OPTARG @@ -508,19 +526,6 @@ if [ $# -gt 0 ]; then done fi -# more re/initialization -# Version info -NAGVIS_TAG=`fmt_version "$NAGVIS_VER"` -# Default Nagios path -NAGIOS_PATH="/usr/local/$SOURCE" -# Default Path to NagVis base -NAGVIS_PATH="/usr/local/nagvis" -[ $NAGVIS_TAG -lt 01050000 ]&&NAGVIS_PATH="/usr/local/$SOURCE/share/nagvis" -# Default nagios share webserver path -HTML_PATH="/nagvis" -[ $NAGVIS_TAG -lt 01050000 ]&&HTML_PATH="/$SOURCE/nagvis" -HTML_BASE=$HTML_PATH - # Print welcome message welcome @@ -570,9 +575,6 @@ else exit 1 fi -# Set default NagVis path -[ -z $NAGVIS_PATH ] && NAGVIS_PATH=${NAGIOS_PATH%/}/share/nagvis - # Get NagVis path if [ $INSTALLER_QUIET -ne 1 ]; then echo -n "| Please enter the path to NagVis base [$NAGVIS_PATH]: " ------------------------------------------------------------------------------ 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
