Use new OSX tap version, and update OSX install scripts.

This commit is contained in:
Adam Ierymenko 2015-11-16 16:19:24 -08:00
parent 38fe77ecf2
commit e4d1aba3f8
11 changed files with 7 additions and 13 deletions

View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>20150118</string>
<string>20131028</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>

Binary file not shown.

View File

@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>KEXT</string>
<key>CFBundleShortVersionString</key>
<string>20131028</string>
<string>20150118</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>

View File

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

View File

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