feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Use tighter regular expression for pkill.

Browse Source
This commit is contained in:
Christian Kandeler
2010-09-28 09:46:33 +02:00
parent 45b269b2d4
commit 7a8b597900
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qt4projectmanager/qt-maemo/maemosshrunner.cpp
View File

@@ -143,11 +143,15 @@ void MaemoSshRunner::cleanup(bool initialCleanup)
emit reportProgress(tr("Killing remote process(es)..."));
m_shuttingDown = !initialCleanup;
// pkill behaves differently on Fremantle and Harmattan.
const char *const killTemplate = "pkill -%2 '^%1$'; pkill -%2 '/%1$';";
QString niceKill;
QString brutalKill;
foreach (const QString &proc, m_procsToKill) {
niceKill += QString::fromLocal8Bit("pkill %1\\$;").arg(proc);
brutalKill += QString::fromLocal8Bit("pkill -9 %1\\$;").arg(proc);
niceKill += QString::fromLocal8Bit(killTemplate).arg(proc).arg("SIGTERM");
brutalKill += QString::fromLocal8Bit(killTemplate).arg(proc).arg("SIGKILL");
}
QString remoteCall = niceKill + QLatin1String("sleep 1; ") + brutalKill;
remoteCall.remove(remoteCall.count() - 1, 1); // Get rid of trailing semicolon.