novi upstream verzije 2.8.3

[ossec-hids.git] / install.sh

diff --git a/install.sh b/install.sh
index 781a762..32b0273 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -11,7 +11,7 @@
 # Changelog 15/07/2006 - Rafael M. Capovilla <under@underlinux.com.br>
 # New function AddTable to add support for OpenBSD pf rules in firewall-drop active response
 
-# Changelog 29 March 2012 - Adding hybrid mode (standalone + agent) 
+# Changelog 29 March 2012 - Adding hybrid mode (standalone + agent)
 
 
 
@@ -67,9 +67,6 @@ Install()
        echo "5- ${installing}"
 
        echo "DIR=\"${INSTALLDIR}\"" > ${LOCATION}
-    echo "CC=${CC}" >> ${LOCATION}
-    echo "GCC=${CC}" >> ${LOCATION}
-    echo "CLANG=clang" >> ${LOCATION}
 
     # Changing Config.OS with the new C flags
     # Checking if debug is enabled
@@ -344,7 +341,7 @@ SetupLogs()
       echo "  </localfile>" >> $NEWCONFIG
    fi
 
-    
+
 
 
     echo ""
@@ -369,7 +366,7 @@ ConfigureClient()
         echo "3- ${configuring} $NAME."
         echo ""
 
-    if [[ "X${USER_AGENT_SERVER_IP}" = "X" && "X${USER_AGENT_SERVER_NAME}" = "X" ]]; then
+    if [ "X${USER_AGENT_SERVER_IP}" = "X" -a "X${USER_AGENT_SERVER_NAME}" = "X" ]; then
         # Looping and asking for server ip or hostname
         while [ 1 ]; do
             $ECHO "  3.1- ${serveraddr}: "
@@ -811,19 +808,6 @@ checkDependencies()
         export  PATH
     fi
 
-    ls "`which gcc`" > /dev/null 2>&1
-    if [ ! $? = 0 ]; then
-        ls "`which cc`" > /dev/null 2>&1
-        if [ ! $? = 0 ]; then
-            if [ "X${USER_BINARYINSTALL}" = "X" ]; then
-                catError "0x3-dependencies"
-            fi
-        fi
-        CC="cc"
-    else
-        CC="gcc"
-    fi
-
     PATH=$OLDOPATH
     export PATH
 }
@@ -1118,8 +1102,8 @@ main()
 
                 ${hybrid}|${hybridm})
                 echo ""
-                   echo "  - ${localchose} (hybrid)."
-                   INSTYPE="local"
+                   echo "  - ${serverchose} (hybrid)."
+                   INSTYPE="server"
                     HYBID="go"
                    break;
                    ;;