c2aca1f5c6
- For both shellprocess and contextualprocess, add a top-level key "timeout" that defaults to 10 seconds (which it already did). - Allows setting "global" timeout for command-lists, while still allowing individual timeouts per-command. - Setting timeout per global variable in contextualprocess is not supported; that would restrict the possible space of comparisions, while not supporting a global setting timeout seems reasonable enough. Use instances if you need wildly variable timeouts and don't want to set them individually.
54 lines
1.5 KiB
C++
54 lines
1.5 KiB
C++
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
|
*
|
|
* Copyright 2018, Adriaan de Groot <groot@kde.org>
|
|
*
|
|
* Calamares is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Calamares is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef SHELLPROCESSJOB_H
|
|
#define SHELLPROCESSJOB_H
|
|
|
|
#include <QObject>
|
|
#include <QVariantMap>
|
|
|
|
#include <CppJob.h>
|
|
|
|
#include <utils/CommandList.h>
|
|
#include <utils/PluginFactory.h>
|
|
|
|
#include <PluginDllMacro.h>
|
|
|
|
|
|
class PLUGINDLLEXPORT ShellProcessJob : public Calamares::CppJob
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
explicit ShellProcessJob( QObject* parent = nullptr );
|
|
virtual ~ShellProcessJob() override;
|
|
|
|
QString prettyName() const override;
|
|
|
|
Calamares::JobResult exec() override;
|
|
|
|
void setConfigurationMap( const QVariantMap& configurationMap ) override;
|
|
|
|
private:
|
|
CalamaresUtils::CommandList* m_commands;
|
|
};
|
|
|
|
CALAMARES_PLUGIN_FACTORY_DECLARATION( ShellProcessJobFactory )
|
|
|
|
#endif // SHELLPROCESSJOB_H
|