From 9df7f65dd591c8ee641f9bd66977b92456be9ed9 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 16 Jan 2014 13:53:31 -0800
Subject: Mac installation, and dump pre10.8 stuff because it turns out that
 10.6 loads the existing kext fine.

---
 ZeroTierUI/installdialog.cpp                       |   8 +++++
 .../tap-mac/pre10.8/tap.kext/Contents/Info.plist   |  36 ---------------------
 .../tap-mac/pre10.8/tap.kext/Contents/MacOS/tap    | Bin 81240 -> 0 bytes
 3 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 ext/bin/tap-mac/pre10.8/tap.kext/Contents/Info.plist
 delete mode 100755 ext/bin/tap-mac/pre10.8/tap.kext/Contents/MacOS/tap

diff --git a/ZeroTierUI/installdialog.cpp b/ZeroTierUI/installdialog.cpp
index 14ad5b6a..29bc0ec7 100644
--- a/ZeroTierUI/installdialog.cpp
+++ b/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
diff --git a/ext/bin/tap-mac/pre10.8/tap.kext/Contents/Info.plist b/ext/bin/tap-mac/pre10.8/tap.kext/Contents/Info.plist
deleted file mode 100644
index 45c2839a..00000000
--- a/ext/bin/tap-mac/pre10.8/tap.kext/Contents/Info.plist
+++ /dev/null
@@ -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>
-
diff --git a/ext/bin/tap-mac/pre10.8/tap.kext/Contents/MacOS/tap b/ext/bin/tap-mac/pre10.8/tap.kext/Contents/MacOS/tap
deleted file mode 100755
index 6a9021a7..00000000
Binary files a/ext/bin/tap-mac/pre10.8/tap.kext/Contents/MacOS/tap and /dev/null differ
-- 
cgit v1.2.3