napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Expand runCommand() inline for CommandLine

Browse Source 
Since we want to hook up more to the runner, the simplified API
in System::runCommand() is not sufficient.
This commit is contained in:
Adriaan de Groot 2024-06-30 15:07:03 +02:00
parent 0d63ebf14f
commit 4815bf6963
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/utils/CommandList.cpp
View File

@ -16,6 +16,7 @@
#include "compat/Variant.h" #include "compat/Variant.h"
#include "locale/Global.h" #include "locale/Global.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Runner.h"
#include "utils/StringExpander.h" #include "utils/StringExpander.h"
#include "utils/System.h" #include "utils/System.h"
#include "utils/Variant.h" #include "utils/Variant.h"
@ -257,7 +258,10 @@ CommandList::run()
shell_cmd << ( environmentSetting + processed_cmd ); shell_cmd << ( environmentSetting + processed_cmd );
std::chrono::seconds timeout = i->timeout() >= std::chrono::seconds::zero() ? i->timeout() : m_timeout; std::chrono::seconds timeout = i->timeout() >= std::chrono::seconds::zero() ? i->timeout() : m_timeout;
ProcessResult r = System::runCommand( location, shell_cmd, QString(), QString(), timeout );
Calamares::Utils::Runner runner( shell_cmd );
runner.setLocation( location ).setTimeout( timeout ).setWorkingDirectory( QString() );
ProcessResult r = runner.run();
if ( r.getExitCode() != 0 ) if ( r.getExitCode() != 0 )
{ {