diff --git a/ZeroTierUI/installdialog.cpp b/ZeroTierUI/installdialog.cpp index 14ad5b6a2..29bc0ec7e 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 45c2839ad..000000000 --- a/ext/bin/tap-mac/pre10.8/tap.kext/Contents/Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - tap - CFBundleIdentifier - com.zerotier.tap - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - tap - CFBundlePackageType - KEXT - CFBundleShortVersionString - 20131028 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - OSBundleLibraries - - com.apple.kpi.mach - 8.0 - com.apple.kpi.bsd - 8.0 - com.apple.kpi.libkern - 8.0 - com.apple.kpi.unsupported - 8.0 - - - - 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 6a9021a74..000000000 Binary files a/ext/bin/tap-mac/pre10.8/tap.kext/Contents/MacOS/tap and /dev/null differ