Merge branch 'ent-6513-fix-macos-para-high-sierra' into 'develop'

force folders creation

See merge request artica/pandorafms!3534
This commit is contained in:
Daniel Rodriguez 2020-11-04 11:55:16 +01:00
commit d920b62d9a
3 changed files with 11 additions and 9 deletions

View File

@ -143,7 +143,7 @@ done
# Darwin dmg installer files # Darwin dmg installer files
echo "Updating DARWIN DMG 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/(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/(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" sed -i -r "s/(CFBundleShortVersionString<\/key>\s*<string>).*(<\/string>)/\1$VERSION\2/g" "$AGENT_DARWIN_PLIST"

View File

@ -22,7 +22,7 @@ fi
# DMG package version # DMG package version
if [ "$#" -ge 2 ]; then if [ "$#" -ge 2 ]; then
VERSION="7.0NG.750" VERSION="$2"
else else
VERSION="7.0NG.750" VERSION="7.0NG.750"
fi fi
@ -37,7 +37,7 @@ fi
BUILD_DMG="$BUILD_PATH/build" BUILD_DMG="$BUILD_PATH/build"
BUILD_TMP="$BUILD_PATH/buildtmp" BUILD_TMP="$BUILD_PATH/buildtmp"
FULLNAME="7.0NG.749" FULLNAME="$DMGNAME-$VERSION.dmg"
echo "VERSION-"$VERSION" NAME-"$DMGNAME echo "VERSION-"$VERSION" NAME-"$DMGNAME
pushd . pushd .
cd $LOCALINST cd $LOCALINST

View File

@ -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` `/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 # Create agent directories and files
mkdir -p /usr/local/share/pandora_agent/collections mkdir -p /usr/local/bin/
mkdir -p /usr/local/share/pandora_agent/commands 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 /etc/pandora/
mkdir -p /var/spool/pandora/data_out mkdir -p /var/spool/pandora/data_out/
mkdir -p /var/log/pandora mkdir -p /var/log/pandora/
mv pandora_agent.conf /etc/pandora/ mv pandora_agent.conf /etc/pandora/
touch /var/log/pandora/pandora_agent.log touch /var/log/pandora/pandora_agent.log
@ -70,9 +72,9 @@ ln -s /usr/local/share/pandora_agent/collections /etc/pandora/collections
# Copy manuals # 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 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 chmod 644 /usr/local/share/man/man1/tentacle_client.1.gz
# Create newsyslog entry # Create newsyslog entry