diff options
| author | kali <kali@leap.se> | 2017-08-05 15:36:21 -0700 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-08-14 18:09:49 -0400 |
| commit | c035917e5318ac494c8b9e7d9fdf09ddcb424006 (patch) | |
| tree | fb6c45d4553ef1fb2fe554840c8a7df871e7496b | |
| parent | 2dec0bfe57c84cbd9751c1c8dd89be61cb994bfb (diff) | |
[pkg] improve logging for the osx install scripts
| -rwxr-xr-x | pkg/osx/scripts/postinstall | 12 | ||||
| -rwxr-xr-x | pkg/osx/scripts/preinstall | 11 |
2 files changed, 18 insertions, 5 deletions
diff --git a/pkg/osx/scripts/postinstall b/pkg/osx/scripts/postinstall index 9c2176b2..393ab658 100755 --- a/pkg/osx/scripts/postinstall +++ b/pkg/osx/scripts/postinstall @@ -1,6 +1,12 @@ #!/bin/sh # Bitmask Post-Instalation script -cp se.leap.bitmask-helper.plist /Library/LaunchDaemons/ -launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist || echo "Already loaded, skipping..." -echo `date` "::Bitmask post-installation script succeeded." >> /tmp/bitmask-install.log +# (c) LEAP Encryption access Project +# We copy the bitmask-helper plist to the LaunchDaemons folder, and load the bitmask-helper that runs as root. + +LOG=/tmp/bitmask-install.log + +cp se.leap.bitmask-helper.plist /Library/LaunchDaemons/ \ + && echo `date` ":: Bitmask post-install: copied bitmask-helper Plist." >> $LOG +launchctl load /Library/LaunchDaemons/se.leap.bitmask-helper.plist && echo `date` ":: Bitmask post-install: loaded bitmask-helper." >> $LOG +echo `date` ":: Bitmask post-install: ok." >> $LOG exit 0 diff --git a/pkg/osx/scripts/preinstall b/pkg/osx/scripts/preinstall index 222922cf..1ae68f9c 100755 --- a/pkg/osx/scripts/preinstall +++ b/pkg/osx/scripts/preinstall @@ -1,5 +1,12 @@ #!/bin/sh # Bitmask Pre-Instalation script -[[ -f /Library/LaunchDaemons/se.leap.bitmask-helper.plist ]] && launchctl unload /Library/LaunchDaemons/se.leap.bitmask-helper.plist -echo `date` "::Bitmask pre-installation script succeeded." >> /tmp/bitmask-install.log +# (c) LEAP Encryption access Project +# We unload the bitmask-helper if it is running, because we can be installing an upgrade. + +LOG=/tmp/bitmask-install.log + +ps aux | grep [b]itmask-helper \ + && launchctl unload /Library/LaunchDaemons/se.leap.bitmask-helper.plist \ + && echo `date` ":: Bitmask pre-install: unloaded bitmask-helper." >> $LOG +echo `date` ":: Bitmask pre-install: ok." >> $LOG exit 0 |