[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 4772e42315005cc4fc78c74e109148f556264c6b
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Jan 29 10:26:40 2012 +0100

    FIX #135 #136 #137

diff --git a/contrib/alternative-installation/shinken-install/shinken.sh b/contrib/alternative-installation/shinken-install/shinken.sh
index a4b2b2d..834f585 100755
--- a/contrib/alternative-installation/shinken-install/shinken.sh
+++ b/contrib/alternative-installation/shinken-install/shinken.sh
@@ -201,7 +201,7 @@ function installpkg(){
 
 function debinstalled(){
     package=$1
-    if [ -z $(dpkg -l $package | grep "^ii") ]
+    if [ -z "$(dpkg -l $package | grep "^ii")" ]
     then
         return 1
     else
@@ -216,7 +216,7 @@ function prerequisites(){
 
     for b in $bins
     do
-        rb=$(which $b >> /tmp/shinken.install.log 2>&1 )
+        rb=$(which $b)
         if [ $? -eq 0 ]
         then
             cecho " > Checking for $b : OK" green 
@@ -963,7 +963,7 @@ function do_skmacro(){
     export PYTHONPATH="$TARGET"
     export SHINKEN="$PYTHONPATH"
     export SKTOOLS="$PYTHONPATH/contrib/alternative-installation/shinken-install/tools"
-    $SKTOOLS/skonf.py -a macros -f $SKTOOLS/macros/$macro -d $args >> /tmp/shinken.install.log 2>&1 
+    $PY $SKTOOLS/skonf.py -a macros -f $SKTOOLS/macros/$macro -d $args >> /tmp/shinken.install.log 2>&1 
 }
 
 

-- 
UNNAMED PROJECT