StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Almost forgot mv is harmful

Browse Source 
Note that this is required because Qt applications cannot run under setuid(0) as qtox_sudo sets

.

Fix quitting
This commit is contained in:
Sean 2015-03-03 19:50:30 -08:00
parent fbd0cc59b6
commit f51cd63cff
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@ -132,7 +132,7 @@ int main(int argc, char *argv[])
AskInstall.setIcon(QMessageBox::Question);
AskInstall.setWindowModality(Qt::ApplicationModal);
AskInstall.setText("Move to Applications folder?");
AskInstall.setInformativeText("I can move myself to the Applications folder, keeping your downloads folder less cluttered\r\n");
AskInstall.setInformativeText("I can move myself to the Applications folder, keeping your downloads folder less cluttered.\r\n");
AskInstall.setStandardButtons(QMessageBox::Yes|QMessageBox::No);
AskInstall.setDefaultButton(QMessageBox::Yes);
@ -146,20 +146,18 @@ int main(int argc, char *argv[])
QString bindir = qApp->applicationDirPath();
QString appdir = bindir;
appdir.chop(15);
QString sudo = bindir + "/qtox_sudo mv " + appdir + " /Applications/qtox.app";
QString sudo = bindir + "/qtox_sudo rsync -avzh --remove-source-file " + appdir + " /Applications/qtox.app";
QString qtox = "open /Applications/qtox.app";
if (fork() != 0) { //uTox grade cheap hack
return EXIT_UPDATE_MACX;
return EXIT_UPDATE_MACX; //Note that if we don't do this the update process will get killed. Also, errors just crash it
}
sudoprocess->start(sudo);
sudoprocess->waitForFinished();
qtoxprocess->start(qtox);
qApp->quit(); //stop it from exiting by crashing rofl
qApp->exit();
return 0;
return 0; //Actually kills it
}
}
#endif