diff options
| author | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-24 23:15:38 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@zerotier.com> | 2014-01-24 23:15:38 -0800 |
| commit | f19d1e253afe690075bb311e708844b8a026fa36 (patch) | |
| tree | 616a10b514b077c1d25478c018249aa25498bbdd /ext | |
| parent | b65f7f78951450998bc4a85f60ce1350c2ed2a12 (diff) | |
| parent | fb49d2ced909982a76553eb2fd5a2c4a104a12e0 (diff) | |
| download | infinitytier-f19d1e253afe690075bb311e708844b8a026fa36.tar.gz infinitytier-f19d1e253afe690075bb311e708844b8a026fa36.zip | |
Merge branch 'adamierymenko-dev' of ssh://shub-niggurath.zerotier.com/git/ZeroTierOne into adamierymenko-dev
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/installfiles/mac/install.tmpl.sh | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ext/installfiles/mac/install.tmpl.sh b/ext/installfiles/mac/install.tmpl.sh index 3dfb79f5..c0484baa 100644 --- a/ext/installfiles/mac/install.tmpl.sh +++ b/ext/installfiles/mac/install.tmpl.sh @@ -127,14 +127,9 @@ fi echo 'Installing and (re-)starting zerotier-one service via launchctl...' mv -f './Library/LaunchDaemons/com.zerotier.one.plist' '/Library/LaunchDaemons/' -if [ ! -z "`launchctl list | grep -F com.zerotier.one`" ]; then - launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist - sleep 1 -fi launchctl load /Library/LaunchDaemons/com.zerotier.one.plist -sleep 1 -/usr/bin/zerotier-cli info +# launchctl will restart us after exit if this is an online auto-update cd /tmp rm -rf _zt1tmp |