diff --git a/contrib/macos/create-pkg.sh b/contrib/macos/create-pkg.sh index cc9a74f79..3d55919f7 100755 --- a/contrib/macos/create-pkg.sh +++ b/contrib/macos/create-pkg.sh @@ -43,15 +43,15 @@ cat > pkgbuild/scripts/postinstall << EOF #!/bin/sh # Normalise the config if it exists, generate it if it doesn't -if [ -f /etc/yggdrasil.conf ]; +if [ -f /usr/local/etc/yggdrasil.conf ]; then mkdir -p /Library/Preferences/Yggdrasil echo "Backing up configuration file to /Library/Preferences/Yggdrasil/yggdrasil.conf.`date +%Y%m%d`" - cp /etc/yggdrasil.conf /Library/Preferences/Yggdrasil/yggdrasil.conf.`date +%Y%m%d` - echo "Normalising /etc/yggdrasil.conf" - /usr/local/bin/yggdrasil -useconffile /Library/Preferences/Yggdrasil/yggdrasil.conf.`date +%Y%m%d` -normaliseconf > /etc/yggdrasil.conf + cp /usr/local/etc/yggdrasil.conf /Library/Preferences/Yggdrasil/yggdrasil.conf.`date +%Y%m%d` + echo "Normalising /usr/local/etc/yggdrasil.conf" + /usr/local/bin/yggdrasil -useconffile /Library/Preferences/Yggdrasil/yggdrasil.conf.`date +%Y%m%d` -normaliseconf > /usr/local/etc/yggdrasil.conf else - /usr/local/bin/yggdrasil -genconf > /etc/yggdrasil.conf + /usr/local/bin/yggdrasil -genconf > /usr/local/etc/yggdrasil.conf fi # Unload existing Yggdrasil launchd service, if possible diff --git a/contrib/macos/yggdrasil.plist b/contrib/macos/yggdrasil.plist index c436d4bd4..dd459b591 100644 --- a/contrib/macos/yggdrasil.plist +++ b/contrib/macos/yggdrasil.plist @@ -1,24 +1,22 @@ - + Label yggdrasil ProgramArguments - sh - -c - /usr/local/bin/yggdrasil -useconffile /etc/yggdrasil.conf + /usr/local/bin/yggdrasil + -useconffile + /usr/local/etc/yggdrasil.conf KeepAlive RunAtLoad - ProcessType - Interactive StandardOutPath - /tmp/yggdrasil.stdout.log + /Library/Logs/yggdrasil.log StandardErrorPath - /tmp/yggdrasil.stderr.log - + /Library/Logs/yggdrasil.log +