[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 e1aef130cc06a509b07b54b130d1ca1ed83a65ba
Merge: 1158621bf4e4a1b16abcc4ce965a69352e3d882b 924b2c26e8041de34cfd8759f01894bf763be1f5
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Feb 26 12:52:21 2012 +0100

    Merge branch 'master' of https://github.com/naparuba/shinken

diff --combined install
index 0450451,56f2b4c..107ea4b
--- a/install
+++ b/install
@@@ -951,10 -951,12 +951,10 @@@ function install_mongodb()
              fi
              ;;
          DEBIAN)
 -#            apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
 -#            echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" > /etc/apt/sources.list.d/10gen.repo
 -#            apt-get update
 -#            apt-get -y install 
 -            cecho " > Unsuported" red
 -            exit 2
 +            apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
 +            echo "deb http://downloads-distro.mongodb.org/repo/debian-sysvinit dist 10gen" > /etc/apt/sources.list.d/10gen.list
 +            apt-get update
 +            apt-get install -y mongodb-10gen
              ;;
          *)
              cecho " > Unknown distribution : $DIST" red
@@@ -1621,23 -1623,25 +1621,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 ] 

-- 
UNNAMED PROJECT