From 85ac793e2b7c30e841f0f6063ff79d0570feb8f1 Mon Sep 17 00:00:00 2001
From: Kevin <kevin.rojas@artica.es>
Date: Fri, 16 Oct 2020 16:05:57 +0200
Subject: [PATCH 1/2] force folders creation

---
 pandora_agents/unix/Darwin/dmg/scripts/postinstall | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pandora_agents/unix/Darwin/dmg/scripts/postinstall b/pandora_agents/unix/Darwin/dmg/scripts/postinstall
index 2f76310fee..5b25222a37 100644
--- a/pandora_agents/unix/Darwin/dmg/scripts/postinstall
+++ b/pandora_agents/unix/Darwin/dmg/scripts/postinstall
@@ -26,11 +26,13 @@ else
 	`/usr/local/share/pandora_agent/inst_utilities/print_conf.pl /usr/local/share/pandora_agent/pandora_agent.conf remote_config $REMOTECFG`
 	
 	# Create agent directories and files
-	mkdir -p /usr/local/share/pandora_agent/collections
-	mkdir -p /usr/local/share/pandora_agent/commands
+	mkdir -p /usr/local/bin/
+	mkdir -p /usr/local/share/man/man1/
+	mkdir -p /usr/local/share/pandora_agent/collections/
+	mkdir -p /usr/local/share/pandora_agent/commands/
 	mkdir -p /etc/pandora/
-	mkdir -p /var/spool/pandora/data_out
-	mkdir -p /var/log/pandora
+	mkdir -p /var/spool/pandora/data_out/
+	mkdir -p /var/log/pandora/
 	mv pandora_agent.conf /etc/pandora/
 	touch /var/log/pandora/pandora_agent.log
 
@@ -70,9 +72,9 @@ ln -s /usr/local/share/pandora_agent/collections /etc/pandora/collections
 
 
 # Copy manuals
-cp -f man/man1/pandora_agent.1.gz /usr/local/share/man/man1
+cp -f man/man1/pandora_agent.1.gz /usr/local/share/man/man1/
 chmod 644 /usr/local/share/man/man1/pandora_agent.1.gz
-cp -f man/man1/tentacle_client.1.gz /usr/local/share/man/man1
+cp -f man/man1/tentacle_client.1.gz /usr/local/share/man/man1/
 chmod 644 /usr/local/share/man/man1/tentacle_client.1.gz
 
 # Create newsyslog entry

From ee45d0c684142bcca838b7bed85bd75f9b3ff2ba Mon Sep 17 00:00:00 2001
From: Kevin <kevin.rojas@artica.es>
Date: Fri, 16 Oct 2020 16:29:02 +0200
Subject: [PATCH 2/2] Fix autoupdate version issue

---
 extras/pandora_update_version.sh                   | 2 +-
 pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh
index 8a16e8e18d..23ea7a4627 100755
--- a/extras/pandora_update_version.sh
+++ b/extras/pandora_update_version.sh
@@ -143,7 +143,7 @@ done
 
 # Darwin dmg installer files
 echo "Updating DARWIN DMG files..."
-sed -i -e "/VERSION/s/=.*/=\"$VERSION\"/" "$AGENT_DARWIN_BUILDER"
+sed -i -e "/VERSION/s/=\"7.0NG.*/=\"$VERSION\"/" "$AGENT_DARWIN_BUILDER"
 sed -i -r "s/(version=\").*(\"\s+onConclusion=)/\1$VERSION\2/g"  "$AGENT_DARWIN_DISTR"
 sed -i -r "s/(CFBundleVersion<\/key>\s*<string>).*(<\/string>)/\1$VERSION\2/g"  "$AGENT_DARWIN_PLIST"
 sed -i -r "s/(CFBundleShortVersionString<\/key>\s*<string>).*(<\/string>)/\1$VERSION\2/g"  "$AGENT_DARWIN_PLIST"
diff --git a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
index 325d149578..95878467ab 100644
--- a/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
+++ b/pandora_agents/unix/Darwin/dmg/build_darwin_dmg.sh
@@ -22,7 +22,7 @@ fi
 
 # DMG package version
 if [ "$#" -ge 2 ]; then
-	VERSION="7.0NG.750"
+	VERSION="$2"
 else
 	VERSION="7.0NG.750"
 fi
@@ -37,7 +37,7 @@ fi
 BUILD_DMG="$BUILD_PATH/build"
 BUILD_TMP="$BUILD_PATH/buildtmp"
 
-FULLNAME="7.0NG.749"
+FULLNAME="$DMGNAME-$VERSION.dmg"
 echo "VERSION-"$VERSION" NAME-"$DMGNAME
 pushd .
 cd $LOCALINST