diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-16 16:19:24 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-11-16 16:19:24 -0800 |
| commit | e4d1aba3f82c1265579b0b9dfba22903e34ae7d1 (patch) | |
| tree | 5e8f8fb2f8e8ed2ebb6c0b29006ebccf5db919c7 /ext/installfiles/mac | |
| parent | 38fe77ecf29370dc1b9dfdec0ddf897cf4348ef5 (diff) | |
| download | infinitytier-e4d1aba3f82c1265579b0b9dfba22903e34ae7d1.tar.gz infinitytier-e4d1aba3f82c1265579b0b9dfba22903e34ae7d1.zip | |
Use new OSX tap version, and update OSX install scripts.
Diffstat (limited to 'ext/installfiles/mac')
| -rwxr-xr-x | ext/installfiles/mac/launch.sh | 10 | ||||
| -rwxr-xr-x | ext/installfiles/mac/postinst.sh | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ext/installfiles/mac/launch.sh b/ext/installfiles/mac/launch.sh index ef22ccbd..41c4b9c8 100755 --- a/ext/installfiles/mac/launch.sh +++ b/ext/installfiles/mac/launch.sh @@ -1,15 +1,7 @@ #!/bin/bash zthome="/Library/Application Support/ZeroTier/One" -export PATH="/bin:/usr/bin:/sbin:/usr/sbin:$zthome" - -# If the app has been deleted, uninstall the service -cd "$zthome" -if [ -L './shutdownIfUnreadable' -a ! -f "`readlink ./shutdownIfUnreadable`" ]; then - rm -f /tmp/ZeroTierOneUninstall.log - /bin/bash "$zthome/uninstall.sh" >/tmp/ZeroTierOneUninstall.log 2>&1 - exit 0 -fi +export PATH="$zthome:/bin:/usr/bin:/sbin:/usr/sbin" # Launch ZeroTier One (not as daemon... launchd monitors it) exec zerotier-one diff --git a/ext/installfiles/mac/postinst.sh b/ext/installfiles/mac/postinst.sh index 987e131b..47d9ddd9 100755 --- a/ext/installfiles/mac/postinst.sh +++ b/ext/installfiles/mac/postinst.sh @@ -6,10 +6,12 @@ launchctl unload /Library/LaunchDaemons/com.zerotier.one.plist >>/dev/null 2>&1 cd "/Library/Application Support/ZeroTier/One" rm -rf node.log node.log.old root-topology shutdownIfUnreadable autoupdate.log updates.d +chown -R 0 tap.kext +chgrp -R 0 tap.kext if [ ! -f authtoken.secret ]; then head -c 4096 /dev/urandom | md5 | head -c 24 >authtoken.secret - chown root authtoken.secret - chgrp wheel authtoken.secret + chown 0 authtoken.secret + chgrp 0 authtoken.secret chmod 0600 authtoken.secret fi rm -f zerotier-cli zerotier-idtool |