From 4aa4ad82d3b95d690b22bb60a0838904f81cd78d Mon Sep 17 00:00:00 2001
From: marostegui <noreply@pandorafms.org>
Date: Thu, 21 Jun 2007 11:43:05 +0000
Subject: [PATCH] 2007-06-18  Manuel Arostegui <marostegui@artica.es>

        * linux/pandora_agent_installer: Fixed a bug related
          with the copy of the pandora_agent_daemon file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@528 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_agents/ChangeLog                     | 5 +++++
 pandora_agents/linux/pandora_agent_installer | 9 ++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 563b10fae5..c66bc0da34 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-18  Manuel Arostegui <marostegui@artica.es>
+
+	* linux/pandora_agent_installer: Fixed a bug related
+	  with the copy of the pandora_agent_daemon file.
+
 2007-06-18  Manuel Arostegui <marostegui@artica.es>
 
 	* linux/pandora_agents.spec: Renamed to pandora_agent.spec
diff --git a/pandora_agents/linux/pandora_agent_installer b/pandora_agents/linux/pandora_agent_installer
index dd8776437e..ccb800b257 100755
--- a/pandora_agents/linux/pandora_agent_installer
+++ b/pandora_agents/linux/pandora_agent_installer
@@ -78,9 +78,9 @@ install () {
         echo "Copying Pandora FMS Agent to $PANDORA_BIN..."
         cp pandora_agent $PANDORA_BIN
         chmod 700 $PANDORA_BIN
-
-        echo "Copying Pandora FMS Agent contrib dir to $PANDORA_HOME/contrib..."
-        cp -R contrib $PANDORA_HOME
+	
+	echo "Copying Pandora FMS Agent contrib dir to $PANDORA_HOME/..."
+        cp pandora_agent_daemon $PANDORA_HOME
 
         echo "Copying Pandora FMS Agent configuration file to $PANDORA_HOME/pandora_agent.conf..."
         cp pandora_agent.conf $PANDORA_HOME
@@ -99,11 +99,10 @@ install () {
         echo "Setting secure permissions and ownership for all Pandora FMS Agent files..."
         chown -R root $PANDORA_HOME
         chmod -R 600 $PANDORA_TEMP/data_out
-        chmod -R 700 $PANDORA_HOME/contrib
         chmod 640 $PANDORA_LOG
         chgrp 3 $PANDORA_LOG
         echo "Linking start-up daemon script at $PANDORA_STARTUP";
-        ln -s $PANDORA_HOME/contrib/pandora_agent_daemon $PANDORA_STARTUP
+        ln -s $PANDORA_HOME/pandora_agent_daemon $PANDORA_STARTUP
         chown -R root $PANDORA_BIN
         echo "Done."
         echo " "