Merge branch 'adamierymenko-dev' of ssh://shub-niggurath.zerotier.com/git/ZeroTierOne into adamierymenko-dev

This commit is contained in:
Adam Ierymenko 2014-01-24 23:15:38 -08:00
commit f19d1e253a

View File

@ -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