[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit 32569c25158020698e7ffa71cf6fd395081253e8
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Mon Feb 6 17:26:05 2012 +0100

    FIX #129 : better instruction when installing check_oracle_health plugin

diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index 943aad1..1065766 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -1433,22 +1433,15 @@ function install_check_wmi_plus(){
 function install_check_oracle_health(){
     cadre "Install nagios plugins" green
 
-
-    # Sugg : 
-    # Is the warning show everytime we want to install the plugin?
-    # Maybe add a condition here, the user may have already installed the oracle client :)
-    cadre "WARNING YOU SHOULD INSTALL ORACLE INSTANT CLIENT FIRST !!!!" yellow
-    cecho " > Download the oracle instant client there (basic AND sdk AND sqlplus) : " yellow
-    cecho " > 64 bits : http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html" yellow
-    cecho " > 32 bits : http://www.oracle.com/technetwork/topics/linuxsoft-082809.html" yellow
-    cecho " > Set the ORACLE_HOME environment variable (better to set it in the bashrc)" yellow
-    cecho " > Set LD_LIBRARY_PATH to ORACLE_HOME (or better create a config file in /etc/ld.so.conf) then run ldconfig" yellow
-    cecho " > press ENTER to continue or CTRL+C to abort" yellow
-    read taste
-
     if [ -z "$ORACLE_HOME" ]
     then
-        cecho " > You must set the ORACLE_HOME environment variable !" red
+        cadre "WARNING YOU SHOULD INSTALL ORACLE INSTANT CLIENT FIRST !!!!" yellow
+        cecho " > Download the oracle instant client there (basic AND sdk AND sqlplus) : " yellow
+        cecho " > 64 bits : http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html" yellow
+        cecho " > 32 bits : http://www.oracle.com/technetwork/topics/linuxsoft-082809.html" yellow
+        cecho " > Set the ORACLE_HOME environment variable (better to set it in the bashrc)" yellow
+        cecho " > Set LD_LIBRARY_PATH to ORACLE_HOME (or better create a config file in /etc/ld.so.conf) then run ldconfig" yellow
+        cecho " > press ENTER to continue or CTRL+C to abort" yellow
         exit 2
     fi
 

-- 
UNNAMED PROJECT