kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/19.08'

Browse source
This commit is contained in:
Alexander Potashev 2019-07-16 15:06:34 +03:00
parent a001c39229 f523585f1b
commit 0e16dbc78b
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp
View file

@ -123,10 +123,11 @@ QString findRecursive(const QString &dir, const QString &basename)
return QString();
}
bool runInstallerScriptOnce(const QString &path, const QStringList &args, const QString &dir)
bool runInstallerScriptOnce(const QString &path, const QStringList &args)
{
QProcess process;
process.setWorkingDirectory(dir);
process.setWorkingDirectory(QFileInfo(path).absolutePath());
process.start(path, args, QIODevice::NotOpen);
if (!process.waitForStarted()) {
fail(i18n("Failed to run installer script %1", path));
@ -148,8 +149,7 @@ bool runInstallerScriptOnce(const QString &path, const QStringList &args, const
// If hasArgVariants is true, run "path".
// If hasArgVariants is false, run "path argVariants[i]" until successful.
bool runInstallerScript(const QString &path, bool hasArgVariants, const QStringList &argVariants, const QString &dir,
QString &errorText)
bool runInstallerScript(const QString &path, bool hasArgVariants, const QStringList &argVariants, QString &errorText)
{
QFile file(path);
if (!file.setPermissions(QFile::ReadOwner | QFile::WriteOwner | QFile::ExeOwner)) {
@ -160,12 +160,12 @@ bool runInstallerScript(const QString &path, bool hasArgVariants, const QStringL
qInfo() << "[servicemenuinstaller]: Trying to run installer/uninstaller" << path;
if (hasArgVariants) {
for (const auto &arg : argVariants) {
if (runInstallerScriptOnce(path, QStringList{arg}, dir)) {
if (runInstallerScriptOnce(path, QStringList{arg})) {
return true;
}
}
} else {
if (runInstallerScriptOnce(path, QStringList{}, dir)) {
if (runInstallerScriptOnce(path, QStringList{})) {
return true;
}
}
@ -227,7 +227,7 @@ bool cmdInstall(const QString &archive, QString &errorText)
}
if (!installItPath.isEmpty()) {
return runInstallerScript(installItPath, false, QStringList{}, dir, errorText);
return runInstallerScript(installItPath, false, QStringList{}, errorText);
}
// If "install-it" is missing, try "install"
@ -242,7 +242,7 @@ bool cmdInstall(const QString &archive, QString &errorText)
}
if (!installerPath.isEmpty()) {
return runInstallerScript(installerPath, true, QStringList{"--local", "--local-install", "--install"}, dir, errorText);
return runInstallerScript(installerPath, true, QStringList{"--local", "--local-install", "--install"}, errorText);
}
fail(i18n("Failed to find an installation script in %1", dir));
@ -277,7 +277,7 @@ bool cmdUninstall(const QString &archive, QString &errorText)
}
if (!deinstallPath.isEmpty()) {
bool ok = runInstallerScript(deinstallPath, false, QStringList{}, dir, errorText);
bool ok = runInstallerScript(deinstallPath, false, QStringList{}, errorText);
if (!ok) {
return ok;
}
@ -297,7 +297,7 @@ bool cmdUninstall(const QString &archive, QString &errorText)
if (!installerPath.isEmpty()) {
bool ok = runInstallerScript(
installerPath, true, QStringList{"--remove", "--delete", "--uninstall", "--deinstall"}, dir, errorText);
installerPath, true, QStringList{"--remove", "--delete", "--uninstall", "--deinstall"}, errorText);
if (!ok) {
return ok;
}

4
src/settings/services/test/service_menu_deinstallation_test.rb
View file

@ -44,10 +44,14 @@ class ServiceMenuDeinstallationTest < Test::Unit::TestCase
FileUtils.mkpath(archive_dir)
File.write("#{archive_dir}/deinstall.sh", <<-DEINSTALL_SH)
#!/bin/sh
set -e
cat deinstall.sh
touch #{@tmpdir}/deinstall.sh-run
DEINSTALL_SH
File.write("#{archive_dir}/install.sh", <<-INSTALL_SH)
#!/bin/sh
set -e
cat install.sh
touch #{@tmpdir}/install.sh-run
INSTALL_SH