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

Utils: Better prerequisites check for DeviceShell

Browse Source 
Check the existence of all commands used by the DeviceShell
script before trying to start it.

Change-Id: I7a69957a979f8eb021c45e54615ad8d38353d28b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-11-10 07:35:13 +01:00
parent c89bef9dcd
commit 421e5d9c59
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/utils/deviceshell.cpp
View File

@@ -240,9 +240,9 @@ bool DeviceShell::start()
bool DeviceShell::checkCommand(const QByteArray &command)
{
const QByteArray checkBase64Cmd = "(which base64 || echo '<missing>')\n";
const QByteArray checkCmd = "(which " + command + " || echo '<missing>')\n";
m_shellProcess->writeRaw(checkBase64Cmd);
m_shellProcess->writeRaw(checkCmd);
if (!m_shellProcess->waitForReadyRead()) {
qCWarning(deviceShellLog) << "Timeout while trying to check for" << command;
return false;
@@ -265,9 +265,12 @@ bool DeviceShell::installShellScript()
return false;
}
if (!checkCommand("base64")) {
m_shellScriptState = State::NoScript;
return false;
static const QList<QByteArray> requiredCommands
= {"base64", "cat", "echo", "kill", "mkfifo", "mktemp", "rm"};
for (const QByteArray &command : requiredCommands) {
if (!checkCommand(command))
return false;
}
const static QByteArray shellScriptBase64 = FilePath(":/utils/scripts/deviceshell.sh")