[Pkg-ossec-devel] [pkg-ossec] 01/01: Replace DIR with DIRECTORY in more locations

[Javier Fernandez-Sanguino Pen~a]

This is an automated email from the git hooks/post-receive script.

jfs pushed a commit to branch master
in repository pkg-ossec.

commit 29024fcbbc629cc0f1e273594336f2c05e880bd8
Author: Javier Fernandez-Sanguino <jfs at debian.org>
Date:   Fri Aug 16 17:52:40 2013 +0200

    Replace DIR with DIRECTORY in more locations
---
 debian/patches/05-standard-pidfile-location |   28 ++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/debian/patches/05-standard-pidfile-location b/debian/patches/05-standard-pidfile-location
index 18c8c8c..f66bf94 100644
--- a/debian/patches/05-standard-pidfile-location
+++ b/debian/patches/05-standard-pidfile-location
@@ -190,6 +190,20 @@
              if [ $? != 0 ]; then
  		echo "${i} did not start correctly.";
                  unlock;
+@@ -251,11 +253,11 @@
+     sleep 2;
+     unlock;
+ 
+-    ls -la "${DIR}/ossec-agent/" >/dev/null 2>&1
++    ls -la "${DIRECTORY}/ossec-agent/" >/dev/null 2>&1
+     if [ $? = 0 ]; then
+         echo ""
+         echo "Starting sub agent directory (for hybrid mode)"
+-        ${DIR}/ossec-agent/bin/ossec-control start
++        ${DIRECTORY}/ossec-agent/bin/ossec-control start
+     fi
+     
+     echo "Completed."
 @@ -271,13 +273,13 @@
          return 0;
      fi
@@ -207,7 +221,7 @@
                  continue;
              fi
                  
-@@ -302,12 +304,12 @@
+@@ -302,22 +304,22 @@
          if [ $? = 1 ]; then
              echo "Killing ${i} .. ";
              
@@ -222,6 +236,18 @@
          
       done    
      
+     unlock;
+ 
+-    ls -la "${DIR}/ossec-agent/" >/dev/null 2>&1
++    ls -la "${DIRECTORY}/ossec-agent/" >/dev/null 2>&1
+     if [ $? = 0 ]; then
+         echo ""
+         echo "Stopping sub agent directory (for hybrid mode)"
+-        ${DIR}/ossec-agent/bin/ossec-control stop
++        ${DIRECTORY}/ossec-agent/bin/ossec-control stop
+     fi
+     echo "$NAME $VERSION Stopped"
+ }
 --- a/src/init/ossec-server.sh
 +++ b/src/init/ossec-server.sh
 @@ -5,11 +5,15 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ossec/pkg-ossec.git