forked from qt-creator/qt-creator
DeviceShell: Don't use 'command' to test for base64
On (debian based) linux the "command -v base64" did fail to find the base64 exectuable. Instead we now use "which". Change-Id: I9b57527d93952b08bcb9abc7484a7e6891aa664c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -53,7 +53,7 @@ namespace {
|
||||
* Once the process exits its exit code is send to stdout with the command-id and the type "R".
|
||||
*
|
||||
*/
|
||||
const QLatin1String r_execScript = QLatin1String(R"(
|
||||
const QLatin1String r_execScript = QLatin1String(R"SCRIPT(
|
||||
#!/bin/sh
|
||||
|
||||
readAndMark() {
|
||||
@@ -133,7 +133,7 @@ cleanup()
|
||||
exit 1
|
||||
}
|
||||
|
||||
if ! command -v base64 &> /dev/null
|
||||
if [ -z "$(which base64)" ]
|
||||
then
|
||||
echo "base64 command could not be found" >&2
|
||||
exit 1
|
||||
@@ -149,7 +149,7 @@ while read -r id inData cmd; do
|
||||
fi
|
||||
execute $id $inData $cmd &
|
||||
done
|
||||
)");
|
||||
)SCRIPT");
|
||||
|
||||
} // namespace
|
||||
|
||||
|
||||
@@ -279,6 +279,6 @@ private slots:
|
||||
}
|
||||
};
|
||||
|
||||
QTEST_MAIN(tst_DeviceShell)
|
||||
QTEST_GUILESS_MAIN(tst_DeviceShell)
|
||||
|
||||
#include "tst_deviceshell.moc"
|
||||
|
||||
@@ -223,6 +223,6 @@ private slots:
|
||||
}
|
||||
};
|
||||
|
||||
QTEST_MAIN(tst_DeviceShell)
|
||||
QTEST_GUILESS_MAIN(tst_DeviceShell)
|
||||
|
||||
#include "tst_deviceshell.moc"
|
||||
|
||||
Reference in New Issue
Block a user