[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, master, updated. 9c40dd1c4f231c1ab530bb8ace24428bd7b4f341

[Jose Antonio Quevedo]

The following commit has been merged in the master branch:
commit d380a6267595c49c9a0db40033e7ce48f691b959
Merge: 795a363bc34580bbf9e8c16e1622a6ba73efdfad 80a8aef9e9678c2f3421d73496c2700d21019957
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Fri Jul 22 21:54:40 2011 +0200

    Merge branch 'upstream'

diff --combined install.sh
index bc7a75a,6a1c388..f566cf2
--- a/install.sh
+++ b/install.sh
@@@ -78,9 -78,6 +78,9 @@@ Install(
  
      echo "CEXTRA=${CEXTRA}" >> ./src/Config.OS
  
 +  # If only-building
 +  if [ "X${BUILD}" = "Xyes" ]; then
 +
      # Makefile
  	echo " - ${runningmake}"
      cd ./src
@@@ -101,11 -98,6 +101,11 @@@
          fi
      fi
  
 +    exit 0
 +
 +  else # End of building
 +
 +
      # If update, stop ossec
      if [ "X${update_only}" = "Xyes" ]; then
          UpdateStopOSSEC
@@@ -156,7 -148,7 +156,7 @@@
              notmodified="yes"
          fi
      fi
 -
 +  fi
  }
  
  
@@@ -935,10 -927,12 +935,12 @@@ main(
          catError "0x1-location";
      fi
  
-     # Must be root
+     # Must be root only in the case of not only-building.
+   if [ ! "X$BUILD" = "Xyes" ]; then
      if [ ! "X$ME" = "Xroot" ]; then
          catError "0x2-beroot";
      fi
+   fi
  
      # Checking dependencies
      checkDependencies

-- 
Git repository for pkg-ossec