mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
Dolphin Service Menu Installer: Launch certain scripts in Konsole
Summary: In general the issue with installers/uninstallers for the dolphin plugin is that a lot of the scripts are intended to be run manually in a terminal. For instance if a script uses `sudo make install` the user can't type in the password. With this patch scripts that are executed without arg variants are executed in konsole (if available). Test Plan: Tests still pass. Try to install the "Jetbrains Dolphin Plugin" tar.gz file from the kde store. If you have the required dependencies etc. the konsole window should close. If the install script fails (type in wrong admin password a couple of times) you should have a shell opened. Reviewers: #dolphin, ngraham, nicolasfella, elvisangelaccio, meven Reviewed By: #dolphin, elvisangelaccio Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D29089
This commit is contained in:
parent
32308843f9
commit
d34559d1c1
|
@ -6,5 +6,6 @@ target_link_libraries(servicemenuinstaller PRIVATE
|
|||
Qt5::Core
|
||||
Qt5::Gui
|
||||
KF5::I18n
|
||||
KF5::CoreAddons
|
||||
)
|
||||
install(TARGETS servicemenuinstaller ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <QGuiApplication>
|
||||
|
||||
#include <KLocalizedString>
|
||||
#include <KShell>
|
||||
|
||||
// @param msg Error that gets logged to CLI
|
||||
Q_NORETURN void fail(const QString &str)
|
||||
|
@ -59,6 +60,11 @@ struct UncompressCommand
|
|||
QStringList args2;
|
||||
};
|
||||
|
||||
enum ScriptExecution{
|
||||
Process,
|
||||
Konsole
|
||||
};
|
||||
|
||||
void runUncompress(const QString &inputPath, const QString &outputPath)
|
||||
{
|
||||
QVector<QPair<QStringList, UncompressCommand>> mimeTypeToCommand;
|
||||
|
@ -126,12 +132,24 @@ QString findRecursive(const QString &dir, const QString &basename)
|
|||
return QString();
|
||||
}
|
||||
|
||||
bool runScriptOnce(const QString &path, const QStringList &args)
|
||||
bool runScriptOnce(const QString &path, const QStringList &args, ScriptExecution execution)
|
||||
{
|
||||
QProcess process;
|
||||
process.setWorkingDirectory(QFileInfo(path).absolutePath());
|
||||
|
||||
process.start(path, args, QIODevice::NotOpen);
|
||||
const static bool konsoleAvailable = !QStandardPaths::findExecutable("konsole").isEmpty();
|
||||
if (konsoleAvailable && execution == ScriptExecution::Konsole) {
|
||||
QString bashCommand = KShell::quoteArg(path) + ' ';
|
||||
if (!args.isEmpty()) {
|
||||
bashCommand.append(args.join(' '));
|
||||
}
|
||||
bashCommand.append("|| $SHELL");
|
||||
// If the install script fails a shell opens and the user can fix the problem
|
||||
// without an error konsole closes
|
||||
process.start("konsole", QStringList() << "-e" << "bash" << "-c" << bashCommand, QIODevice::NotOpen);
|
||||
} else {
|
||||
process.start(path, args, QIODevice::NotOpen);
|
||||
}
|
||||
if (!process.waitForStarted()) {
|
||||
fail(i18n("Failed to run installer script %1", path));
|
||||
}
|
||||
|
@ -163,11 +181,11 @@ bool runScriptVariants(const QString &path, bool hasArgVariants, const QStringLi
|
|||
qInfo() << "[servicemenuinstaller]: Trying to run installer/uninstaller" << path;
|
||||
if (hasArgVariants) {
|
||||
for (const auto &arg : argVariants) {
|
||||
if (runScriptOnce(path, {arg})) {
|
||||
if (runScriptOnce(path, {arg}, ScriptExecution::Process)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} else if (runScriptOnce(path, {})) {
|
||||
} else if (runScriptOnce(path, {}, ScriptExecution::Konsole)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -247,7 +265,11 @@ bool cmdInstall(const QString &archive, QString &errorText)
|
|||
}
|
||||
|
||||
if (!installerPath.isEmpty()) {
|
||||
return runScriptVariants(installerPath, true, {"--local", "--local-install", "--install"}, errorText);
|
||||
// Try to run script without variants first
|
||||
if (!runScriptVariants(installerPath, false, {}, errorText)) {
|
||||
return runScriptVariants(installerPath, true, {"--local", "--local-install", "--install"}, errorText);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
fail(i18n("Failed to find an installation script in %1", dir));
|
||||
|
|
Loading…
Reference in a new issue