X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=src%2Finit%2Fupdate.sh;h=65d1691027738f4731e0b4c74d922d82af4ff7fc;hb=3f728675941dc69d4e544d3a880a56240a6e394a;hp=61ff28e4bbbefd8f23162ebbbbe874e42d585e12;hpb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;p=ossec-hids.git

diff --git a/src/init/update.sh b/src/init/update.sh
index 61ff28e..65d1691 100755
--- a/src/init/update.sh
+++ b/src/init/update.sh
@@ -1,16 +1,10 @@
 #!/bin/sh
 # Shell script update functions for the OSSEC HIDS
 # Author: Daniel B. Cid <daniel.cid@gmail.com>
-# Last modification: May 24, 2006
-
 
 FALSE="false"
 TRUE="true"
 
-
-##########
-# isUpdate
-##########
 isUpdate()
 {
     ls -la ${OSSEC_INIT} > /dev/null 2>&1
@@ -31,10 +25,6 @@ isUpdate()
     return 1;
 }
 
-
-##########
-# doUpdatecleanup
-##########
 doUpdatecleanup()
 {
     . ${OSSEC_INIT}
@@ -46,19 +36,15 @@ doUpdatecleanup()
     fi
 
     # Checking if the directory is valid.
-    local _dir_pattern="^/[-a-zA-Z0-9/\.-]{3,128}$"
-    echo $DIRECTORY | grep -E "$_dir_pattern" > /dev/null 2>&1
+    _dir_pattern_update="^/[-a-zA-Z0-9/\.-]{3,128}$"
+    echo $DIRECTORY | grep -E "$_dir_pattern_update" > /dev/null 2>&1
     if [ ! $? = 0 ]; then
-        echo "# ($FUNCNAME) ERROR: directory name ($DIRECTORY) doesn't match the pattern $_dir_pattern" 1>&2
+        echo "# ($FUNCNAME) ERROR: directory name ($DIRECTORY) doesn't match the pattern $_dir_pattern_update" 1>&2
         echo "${FALSE}"
         return 1;
     fi
 }
 
-
-##########
-# getPreinstalled
-##########
 getPreinstalled()
 {
     . ${OSSEC_INIT}
@@ -80,10 +66,6 @@ getPreinstalled()
     return 0;
 }
 
-
-##########
-# getPreinstalledDir
-##########
 getPreinstalledDir()
 {
     . ${OSSEC_INIT}
@@ -91,10 +73,6 @@ getPreinstalledDir()
     return 0;
 }
 
-
-##########
-# UpdateStartOSSEC
-##########
 UpdateStartOSSEC()
 {
    . ${OSSEC_INIT}
@@ -102,10 +80,6 @@ UpdateStartOSSEC()
    $DIRECTORY/bin/ossec-control start
 }
 
-
-##########
-# UpdateStopOSSEC
-##########
 UpdateStopOSSEC()
 {
    . ${OSSEC_INIT}
@@ -120,9 +94,6 @@ UpdateStopOSSEC()
    rm -f $DIRECTORY/queue/syscheck/.* > /dev/null 2>&1
 }
 
-##########
-# UpdateOSSECRules
-##########
 UpdateOSSECRules()
 {
     . ${OSSEC_INIT}
@@ -139,7 +110,7 @@ UpdateOSSECRules()
     grep -E '<decoder>|<decoder_dir|<rule_dir>' ${OSSEC_CONF_FILE} | grep -v '<!--' >> "${OSSEC_CONF_FILE}.$$.tmp2"
 
     # Check for custom files that may have been added in <rules> element
-    for i in $(grep -E '<include>|<list>' ${OSSEC_CONF_FILE} | grep -v '<!--')
+    for i in `grep -E '<include>|<list>' ${OSSEC_CONF_FILE} | grep -v '<!--'`
     do
       grep "$i" ${RULES_TEMPLATE}>/dev/null || echo "    $i" >> "${OSSEC_CONF_FILE}.$$.tmp2"
     done
@@ -155,3 +126,4 @@ UpdateOSSECRules()
     echo "</ossec_config>  <!-- rules global entry -->" >> ${OSSEC_CONF_FILE}
     rm "${OSSEC_CONF_FILE}.$$.tmp2"
 }
+