dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mac install fixes, more internal use scripts.

Browse source
This commit is contained in:
Adam Ierymenko 2014-01-08 23:12:03 -08:00
parent 60731e6d02
commit 3482d836ae
11 changed files with 38 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ZeroTierUI/installdialog.cpp
View file

@ -106,16 +106,14 @@ void InstallDialog::on_networkReply(QNetworkReply *reply)
QApplication::exit(1);
return;
}
QProcess::execute(installHelperPath,QStringList());
if (!QFile::exists("/Library/Application Support/ZeroTier/One/zerotier-one")) {
QMessageBox::critical(this,"Installation Failed","Installation failed. Are you sure you entered your password correctly?",QMessageBox::Ok,QMessageBox::NoButton);
QApplication::exit(1);
return;
}
// Terminate the GUI and execute the install helper instead
::execl(installHelperPath.toStdString().c_str(),installHelperPath.toStdString().c_str(),(const char *)0);
// We only make it here if execl() failed
QMessageBox::critical(this,"Unable to Locate Helper","Unable to locate install helper, cannot install service.",QMessageBox::Ok,QMessageBox::NoButton);
QApplication::exit(1);
((QMainWindow *)this->parent())->setHidden(false);
this->close();
return;
#endif
} break;