[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 924b2c26e8041de34cfd8759f01894bf763be1f5
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Feb 26 12:16:47 2012 +0100

    FIX #187 now wmic is back

diff --git a/install b/install
index 14d38b9..56f2b4c 100755
--- a/install
+++ b/install
@@ -1623,23 +1623,25 @@ function install_check_wmi_plus(){
         apt-get -y install $WMICAPTPKG >> $TMP/shinken.install.log 2>&1
     fi 
     cd $TMP
-    cecho " > Downloading wmic" green
     filename=$(echo $WMIC | awk -F"/" '{print $NF}')
-    if [ ! -f $(echo $filename | sed -e "s/\.bz2//g") ]
+    folder=$(echo $filename | sed -e "s/\.tar\.gz//g")
+    if [ ! -f $filename ]
     then
-        wget $WGETPROXY $WMIC >> $TMP/shinken.install.log 2>&1 
-        bunzip2 $filename
-    else
-        rm -Rf $(echo $filename | sed -e "s/\.tar//g")
+        cecho " > Downloading wmic" green
+        wget $WGETPROXY $WMIC >> $TMP/shinken.install.log 2>&1
+        if [ $? -ne 0 ]
+        then
+            cecho " > Error while downloading $VMIC" red
+            exit 2
+        fi 
     fi
-    if [ $? -ne 0 ]
-    then
-        cecho " > Error while downloading $filename" red
-        exit 2
+    if [ -d $folder ]
+    then 
+        rm -Rf $folder
     fi
     cecho " > Extracting archive " green
-    tar xvf $(echo $filename| sed -e "s/\.bz2//g") >> $TMP/shinken.install.log 2>&1 
-    cd $(echo $filename | sed -e "s/\.tar\.bz2//g")
+    tar zxvf $filename >> $TMP/shinken.install.log 2>&1
+    cd $folder
     cecho " > Building wmic" green
     make >> $TMP/shinken.install.log 2>&1 
     if [ $? -ne 0 ] 
diff --git a/install.d/shinken.conf b/install.d/shinken.conf
index 9ff7bfd..c736a90 100644
--- a/install.d/shinken.conf
+++ b/install.d/shinken.conf
@@ -167,7 +167,7 @@ export MKYUMPKG="mod_python sudo"
 
 export WMICAPTPKG="autoconf libdatetime-perl libnagios-plugin-perl libconfig-inifiles-perl"
 export WMICYUMPKG="autoconf python perl-DateTime perl-Config-IniFiles"
-export WMIC="http://dev.zenoss.org/svn/trunk/inst/externallibs/wmi-1.3.16.tar.bz2"
+export WMIC="http://www.shinken-monitoring.org/archives/wmi-1.3.14.tar.gz"
 export CHECKWMIPLUS="http://edcint.co.nz/checkwmiplus/sites/default/files/check_wmi_plus.v1.49.tar.gz"
 
 export CHECKHPASM="http://labs.consol.de/wp-content/uploads/2011/10/check_hpasm-4.3.tar.gz"

-- 
UNNAMED PROJECT