Browse Source

Mac installation, and dump pre10.8 stuff because it turns out that 10.6 loads the existing kext fine.

Adam Ierymenko 11 years ago
parent
commit
9df7f65dd5

+ 8 - 0
ZeroTierUI/installdialog.cpp

@@ -161,6 +161,14 @@ void InstallDialog::on_networkReply(QNetworkReply *reply)
 						unlink(tmpPath.c_str());
 						unlink(instPath.c_str());
 
+						// Restart the binary with whatever updates may have occurred
+						std::string appPath(QCoreApplication::applicationFilePath().toStdString());
+						execl(appPath.c_str(),appPath.c_str(),(const char *)0);
+
+						// We only make it here if execl() fails
+						QMessageBox::critical(this,"Re-Launch Failed","An error occurred re-launching ZeroTier One.app. Try launching it manually.",QMessageBox::Ok,QMessageBox::NoButton);
+						QApplication::exit(1);
+
 						return;
 					}
 #endif

+ 0 - 36
ext/bin/tap-mac/pre10.8/tap.kext/Contents/Info.plist

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleExecutable</key>
-	<string>tap</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.zerotier.tap</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>tap</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>20131028</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>com.apple.kpi.mach</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>8.0</string>
-		<key>com.apple.kpi.unsupported</key>
-		<string>8.0</string>
-	</dict>
-</dict>
-</plist>
-

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