From 1da7c19c2e0a877d295ae4370bf025d60aaab113 Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Thu, 2 Mar 2017 13:14:04 +0000
Subject: [PATCH] =?UTF-8?q?#718:=20OGAgent=20para=20macOS:=20a=C3=B1adir?=
 =?UTF-8?q?=20dependencia=20a=20la=20MV=20Vagrant;=20crear=20fichero=20{{{?=
 =?UTF-8?q?pkg}}}=20sin=20espacios=20y=20evitar=20error=20al=20instalar=20?=
 =?UTF-8?q?OGAgent=20si=20no=20existe=20{{{/usr/local}}}.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5218 a21b9725-9963-47de-94b9-378ad31fedc9
---
 macos/build-pkg.sh                       | 7 ++++---
 macos/scripts/es.opengnsys.ogagent.plist | 6 +-----
 macos/scripts/postinstall                | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/macos/build-pkg.sh b/macos/build-pkg.sh
index 9338bd2..02cf165 100755
--- a/macos/build-pkg.sh
+++ b/macos/build-pkg.sh
@@ -6,7 +6,7 @@ VERSION=1.1.0
 AUTHOR="OpenGnsys Project"
 
 # Create directories.
-mkdir build && cd build
+mkdir -p build && cd build
 mkdir -p flat/base.pkg flat/Resources/en.lproj
 mkdir -p root/Applications
 
@@ -79,6 +79,7 @@ cat << EOT > flat/Distribution
 </installer-script>
 EOT
 
-# Create Xar application archive.
-( cd flat && xar --compression none -cf "../../../OGAgent-$VERSION Installer.pkg" * )
+# Create new Xar application archive.
+rm -f ../../../OGAgentInstaller-$VERSION.pkg
+( cd flat && xar --compression none -cf "../../../OGAgentInstaller-$VERSION.pkg" * )
 
diff --git a/macos/scripts/es.opengnsys.ogagent.plist b/macos/scripts/es.opengnsys.ogagent.plist
index 1ea8dd0..5ec11fa 100644
--- a/macos/scripts/es.opengnsys.ogagent.plist
+++ b/macos/scripts/es.opengnsys.ogagent.plist
@@ -5,15 +5,11 @@
                 <string>es.opengnsys.ogagent</string>
                 <key>ProgramArguments</key>
                 <array>
-                        <string>/usr/local/bin/ogagent</string>
+                        <string>/usr/bin/ogagent</string>
                         <string>start</string>
                 </array>
                 <key>RunAtLoad</key>
                 <true/>
-                <key>StandardOutPath</key>
-                <string>/var/log/ogagent.log</string>
-                <key>StandardErrorPath</key>
-                <string>/var/log/ogagent.err</string>
         </dict>
 </plist>
 
diff --git a/macos/scripts/postinstall b/macos/scripts/postinstall
index 4c092ca..007f77c 100755
--- a/macos/scripts/postinstall
+++ b/macos/scripts/postinstall
@@ -2,7 +2,7 @@
 
 # Directories
 SRCDIR=$(dirname "$0")
-BINDIR=/usr/local/bin
+BINDIR=/usr/bin
 INITDIR=/Library/LaunchDaemons
 
 # Dependencies: