applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 09:55:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[libcalamares] Move CommandList into libcalamares

Browse source 
- Move CommandList so it can be used from more modules than
   just ShellProcess
 - Allow a CommandList to run itself. This centralizes
   code for executing one or more commands and simplifies
   the ShellProcess module.

Various small cleanups:
 - mention instance id in log message
 - code formatting / style
This commit is contained in:
Adriaan de Groot 2018-01-15 05:59:44 -05:00
parent 60f4dd7b3b
commit 913690650f
8 changed files with 142 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/modules/shellprocess/ShellProcessJob.cpp
View file

@ -18,8 +18,6 @@
#include "ShellProcessJob.h"
#include "CommandList.h"
#include <QProcess>
#include <QDateTime>
#include <QThread>
@ -30,10 +28,9 @@
#include "utils/CalamaresUtils.h"
#include "utils/CalamaresUtilsSystem.h"
#include "utils/CommandList.h"
#include "utils/Logger.h"
class CommandList;
ShellProcessJob::ShellProcessJob( QObject* parent )
: Calamares::CppJob( parent )
, m_commands( nullptr )
@ -59,56 +56,14 @@ ShellProcessJob::prettyName() const
Calamares::JobResult
ShellProcessJob::exec()
{
using CalamaresUtils::System;
System::RunLocation location = m_dontChroot ? System::RunLocation::RunInHost : System::RunLocation::RunInTarget;
if ( ! m_commands || m_commands->isEmpty() )
{
cDebug() << "WARNING: No commands to execute";
cDebug() << "WARNING: No commands to execute" << moduleInstanceKey();
return Calamares::JobResult::ok();
}
/* Figure out the replacement for @@ROOT@@ */
QString root = QStringLiteral( "/" );
Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
if ( location == System::RunLocation::RunInTarget )
{
if ( !gs || !gs->contains( "rootMountPoint" ) )
{
cDebug() << "ERROR: No rootMountPoint defined.";
return Calamares::JobResult::error( tr( "Could not run command." ),
tr( "No rootMountPoint is defined, so command cannot be run in the target environment." ) );
}
root = gs->value( "rootMountPoint" ).toString();
}
for ( CommandList::const_iterator i = m_commands->cbegin(); i != m_commands->cend(); ++i )
{
QString processed_cmd = *i;
processed_cmd.replace( "@@ROOT@@", root ); // FIXME?
bool suppress_result = false;
if ( processed_cmd.startsWith( '-' ) )
{
suppress_result = true;
processed_cmd.remove( 0, 1 ); // Drop the - // FIXME?
}
QStringList shell_cmd { "/bin/sh", "-c" };
shell_cmd << processed_cmd;
CalamaresUtils::ProcessResult r = System::runCommand(
location, shell_cmd, QString(), QString(), 10 );
if ( r.getExitCode() != 0 )
{
if ( suppress_result )
cDebug() << "Error code" << r.getExitCode() << "ignored by ShellProcess configuration.";
else
return r.explainProcess( this, processed_cmd, 10 );
}
}
return Calamares::JobResult::ok();
return m_commands->run( this );
}
@ -119,7 +74,7 @@ ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
if ( configurationMap.contains( "script" ) )
{
m_commands = new CommandList( configurationMap.value( "script" ) );
m_commands = new CalamaresUtils::CommandList( configurationMap.value( "script" ), !m_dontChroot );
if ( m_commands->isEmpty() )
cDebug() << "ShellProcessJob: \"script\" contains no commands for" << moduleInstanceKey();
}