chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 10:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve file exec permissions for Mac update

Browse Source
This commit is contained in:
Mark Watkins 2011-12-18 16:22:02 +10:00
parent 7413ff1322
commit 6f147b2e03
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UpdaterWindow.cpp
View File

@ -372,6 +372,8 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
} while (!line.isNull()); } while (!line.isNull());
} else { } else {
QString fn=files.at(i).section("/",-1); QString fn=files.at(i).section("/",-1);
QFile::Permissions perm=orig.permissions(apppath+fn);
// delete backups // delete backups
if (f.exists(backups+fn)) f.remove(backups+fn); if (f.exists(backups+fn)) f.remove(backups+fn);
// rename (move) current file to backup // rename (move) current file to backup
@ -383,6 +385,7 @@ void UpdaterWindow::replyFinished(QNetworkReply * reply)
f.open(QFile::WriteOnly); f.open(QFile::WriteOnly);
f.write(ba); f.write(ba);
f.close(); f.close();
f.setPermissions(perm);
} }
} }
if (bar) { if (bar) {

7
mainwindow.cpp
View File

@ -1155,11 +1155,12 @@ void MainWindow::RestartApplication(bool force_login)
QStringList args; QStringList args;
args << "-n"; // -n option is important, as it opens a new process args << "-n"; // -n option is important, as it opens a new process
args << apppath; args << apppath;
args << "--args";
args << "-p"; args << "--args"; // SleepyHead binary options after this
args << "-p"; // -p starts with 1 second delay, to give this process time to save..
if (force_login) args << "-l"; if (force_login) args << "-l";
// -p starts with 1 second delay, to give this process time to save..
if (QProcess::startDetached("/usr/bin/open",args)) { if (QProcess::startDetached("/usr/bin/open",args)) {
QApplication::instance()->exit(); QApplication::instance()->exit();