diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-01-16 13:53:31 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-01-16 13:53:31 -0800 |
| commit | 9df7f65dd591c8ee641f9bd66977b92456be9ed9 (patch) | |
| tree | 6ed2ef5bd9e77d8761e88c0bb65ed12a8c16167f | |
| parent | e23be8c91a4b8047301fc20bb74c767b86bd00d2 (diff) | |
| download | infinitytier-9df7f65dd591c8ee641f9bd66977b92456be9ed9.tar.gz infinitytier-9df7f65dd591c8ee641f9bd66977b92456be9ed9.zip | |
Mac installation, and dump pre10.8 stuff because it turns out that 10.6 loads the existing kext fine.
| -rw-r--r-- | ZeroTierUI/installdialog.cpp | 8 | ||||
| -rw-r--r-- | ext/bin/tap-mac/pre10.8/tap.kext/Contents/Info.plist | 36 | ||||
| -rwxr-xr-x | ext/bin/tap-mac/pre10.8/tap.kext/Contents/MacOS/tap | bin | 81240 -> 0 bytes |
3 files changed, 8 insertions, 36 deletions
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 Binary files differdeleted file mode 100755 index 6a9021a7..00000000 --- a/ext/bin/tap-mac/pre10.8/tap.kext/Contents/MacOS/tap +++ /dev/null |