Browse Source

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

Adam Ierymenko 9 years ago
parent
commit
e4d1aba3f8

BIN
ext/bin/tap-mac/com.zerotier.tap.kext/Contents/MacOS/tap


+ 1 - 1
ext/bin/tap-mac/com.zerotier.tap.kext/Contents/Info.plist → ext/bin/tap-mac/tap.kext.old/Contents/Info.plist

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

BIN
ext/bin/tap-mac/tap.kext.old/Contents/MacOS/tap


+ 0 - 0
ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeDirectory → ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeDirectory


+ 0 - 0
ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeRequirements → ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeRequirements


+ 0 - 0
ext/bin/tap-mac/com.zerotier.tap.kext/Contents/_CodeSignature/CodeResources → ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeResources


+ 0 - 0
ext/bin/tap-mac/tap.kext/Contents/_CodeSignature/CodeSignature → ext/bin/tap-mac/tap.kext.old/Contents/_CodeSignature/CodeSignature


+ 1 - 1
ext/bin/tap-mac/tap.kext/Contents/Info.plist

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

BIN
ext/bin/tap-mac/tap.kext/Contents/MacOS/tap


+ 1 - 9
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

+ 4 - 2
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