Browse Source

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

Adam Ierymenko 11 years ago
parent
commit
f19d1e253a
1 changed files with 1 additions and 6 deletions
  1. 1 6
      ext/installfiles/mac/install.tmpl.sh

+ 1 - 6
ext/installfiles/mac/install.tmpl.sh

@@ -127,14 +127,9 @@ fi
 echo 'Installing and (re-)starting zerotier-one service via launchctl...'
 echo 'Installing and (re-)starting zerotier-one service via launchctl...'
 
 
 mv -f './Library/LaunchDaemons/com.zerotier.one.plist' '/Library/LaunchDaemons/'
 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
 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
 cd /tmp
 rm -rf _zt1tmp
 rm -rf _zt1tmp