From 54fd4d077234a4b33298fcebdd25408278932cc1 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Wed, 15 Apr 2020 10:35:06 +0200 Subject: [PATCH 1/3] GIT_SILENT Upgrade release service version to 20.04.0. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e8ce07ca..68ca54086 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (RELEASE_SERVICE_VERSION_MAJOR "20") -set (RELEASE_SERVICE_VERSION_MINOR "03") -set (RELEASE_SERVICE_VERSION_MICRO "90") +set (RELEASE_SERVICE_VERSION_MINOR "04") +set (RELEASE_SERVICE_VERSION_MICRO "0") set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}") project(Dolphin VERSION ${RELEASE_SERVICE_VERSION}) From 4788820bec89cb45eab14c0019746546298b76af Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Wed, 15 Apr 2020 10:59:54 +0200 Subject: [PATCH 2/3] GIT_SILENT Update Appstream for new release --- src/org.kde.dolphin.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org.kde.dolphin.appdata.xml b/src/org.kde.dolphin.appdata.xml index 358274912..c3d2c7fc0 100644 --- a/src/org.kde.dolphin.appdata.xml +++ b/src/org.kde.dolphin.appdata.xml @@ -589,9 +589,9 @@ dolphin + - From 76f9d9a5f5c6b2a26d4e7e927a39f52ebf88960c Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Mon, 13 Apr 2020 18:03:51 +0200 Subject: [PATCH 3/3] Dolphin Service Menu installer cleanup Summary: This patch contains some smaller formatting/coding style changes to avoid unrelated changes in other patches. - Use {} instead of QStringList{} consistently - Use parehthesese in `UncompressCommand({})` consistently - Use `QStringList name = {}` instead of `auto name = QStringList{}` - Add one qAsConst, remove qAsConst if value is already const Test Plan: Compile, install and run tests Reviewers: #dolphin, ngraham, nicolasfella Subscribers: kfm-devel Tags: #dolphin Differential Revision: https://phabricator.kde.org/D28801 --- .../servicemenuinstaller.cpp | 87 +++++++++---------- 1 file changed, 42 insertions(+), 45 deletions(-) diff --git a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp index 73882e8c2..1c4ea4cff 100644 --- a/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp +++ b/src/settings/services/servicemenuinstaller/servicemenuinstaller.cpp @@ -37,7 +37,7 @@ Q_NORETURN void fail(const QString &str) qCritical() << str; QProcess process; - auto args = QStringList{"--passivepopup", i18n("Dolphin service menu installation failed"), "15"}; + const QStringList args = {"--passivepopup", i18n("Dolphin service menu installation failed"), "15"}; process.start("kdialog", args, QIODevice::ReadOnly); if (!process.waitForStarted()) { qFatal("Failed to run kdialog"); @@ -59,34 +59,34 @@ struct UncompressCommand QStringList args2; }; -void runUncompress(const QString &inputPath, const QString &outputPath) { +void runUncompress(const QString &inputPath, const QString &outputPath) +{ QVector> mimeTypeToCommand; - mimeTypeToCommand.append({QStringList{"application/x-tar", "application/tar", "application/x-gtar", - "multipart/x-tar"}, - UncompressCommand{"tar", QStringList() << "-xf", QStringList() << "-C"}}); - mimeTypeToCommand.append({QStringList{"application/x-gzip", "application/gzip", - "application/x-gzip-compressed-tar", "application/gzip-compressed-tar", - "application/x-gzip-compressed", "application/gzip-compressed", - "application/tgz", "application/x-compressed-tar", - "application/x-compressed-gtar", "file/tgz", - "multipart/x-tar-gz", "application/x-gunzip", "application/gzipped", - "gzip/document"}, - UncompressCommand{"tar", QStringList{"-zxf"}, QStringList{"-C"}}}); - mimeTypeToCommand.append({QStringList{"application/bzip", "application/bzip2", "application/x-bzip", - "application/x-bzip2", "application/bzip-compressed", - "application/bzip2-compressed", "application/x-bzip-compressed", - "application/x-bzip2-compressed", "application/bzip-compressed-tar", - "application/bzip2-compressed-tar", "application/x-bzip-compressed-tar", - "application/x-bzip2-compressed-tar", "application/x-bz2"}, - UncompressCommand{"tar", QStringList{"-jxf"}, QStringList{"-C"}}}); - mimeTypeToCommand.append({QStringList{"application/zip", "application/x-zip", "application/x-zip-compressed", - "multipart/x-zip"}, - UncompressCommand{"unzip", QStringList{}, QStringList{"-d"}}}); + mimeTypeToCommand.append({{"application/x-tar", "application/tar", "application/x-gtar", "multipart/x-tar"}, + UncompressCommand({"tar", {"-xf"}, {"-C"}})}); + mimeTypeToCommand.append({{"application/x-gzip", "application/gzip", + "application/x-gzip-compressed-tar", "application/gzip-compressed-tar", + "application/x-gzip-compressed", "application/gzip-compressed", + "application/tgz", "application/x-compressed-tar", + "application/x-compressed-gtar", "file/tgz", + "multipart/x-tar-gz", "application/x-gunzip", "application/gzipped", + "gzip/document"}, + UncompressCommand({"tar", {"-zxf"}, {"-C"}})}); + mimeTypeToCommand.append({{"application/bzip", "application/bzip2", "application/x-bzip", + "application/x-bzip2", "application/bzip-compressed", + "application/bzip2-compressed", "application/x-bzip-compressed", + "application/x-bzip2-compressed", "application/bzip-compressed-tar", + "application/bzip2-compressed-tar", "application/x-bzip-compressed-tar", + "application/x-bzip2-compressed-tar", "application/x-bz2"}, + UncompressCommand({"tar", {"-jxf"}, {"-C"}})}); + mimeTypeToCommand.append({{"application/zip", "application/x-zip", "application/x-zip-compressed", + "multipart/x-zip"}, + UncompressCommand({"unzip", {}, {"-d"}})}); const auto mime = QMimeDatabase().mimeTypeForFile(inputPath).name(); UncompressCommand command{}; - for (const auto &pair : mimeTypeToCommand) { + for (const auto &pair : qAsConst(mimeTypeToCommand)) { if (pair.first.contains(mime)) { command = pair.second; break; @@ -163,14 +163,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})) { + if (runInstallerScriptOnce(path, {arg})) { return true; } } - } else { - if (runInstallerScriptOnce(path, QStringList{})) { - return true; - } + } else if (runInstallerScriptOnce(path, {})) { + return true; } errorText = i18nc( @@ -224,8 +222,8 @@ bool cmdInstall(const QString &archive, QString &errorText) // Try "install-it" first QString installItPath; - const auto basenames1 = QStringList{"install-it.sh", "install-it"}; - for (const auto &basename : qAsConst(basenames1)) { + const QStringList basenames1 = {"install-it.sh", "install-it"}; + for (const auto &basename : basenames1) { const auto path = findRecursive(dir, basename); if (!path.isEmpty()) { installItPath = path; @@ -239,8 +237,8 @@ bool cmdInstall(const QString &archive, QString &errorText) // If "install-it" is missing, try "install" QString installerPath; - const auto basenames2 = QStringList{"installKDE4.sh", "installKDE4", "install.sh", "install"}; - for (const auto &basename : qAsConst(basenames2)) { + const QStringList basenames2 = {"installKDE4.sh", "installKDE4", "install.sh", "install"}; + for (const auto &basename : basenames2) { const auto path = findRecursive(dir, basename); if (!path.isEmpty()) { installerPath = path; @@ -249,7 +247,7 @@ bool cmdInstall(const QString &archive, QString &errorText) } if (!installerPath.isEmpty()) { - return runInstallerScript(installerPath, true, QStringList{"--local", "--local-install", "--install"}, errorText); + return runInstallerScript(installerPath, true, {"--local", "--local-install", "--install"}, errorText); } fail(i18n("Failed to find an installation script in %1", dir)); @@ -274,8 +272,8 @@ bool cmdUninstall(const QString &archive, QString &errorText) // Try "deinstall" first QString deinstallPath; - const auto basenames1 = QStringList{"deinstall.sh", "deinstall"}; - for (const auto &basename : qAsConst(basenames1)) { + const QStringList basenames1 = {"deinstall.sh", "deinstall"}; + for (const auto &basename : basenames1) { const auto path = findRecursive(dir, basename); if (!path.isEmpty()) { deinstallPath = path; @@ -284,17 +282,16 @@ bool cmdUninstall(const QString &archive, QString &errorText) } if (!deinstallPath.isEmpty()) { - bool ok = runInstallerScript(deinstallPath, false, QStringList{}, errorText); + const bool ok = runInstallerScript(deinstallPath, false, {}, errorText); if (!ok) { return ok; } } else { // If "deinstall" is missing, try "install --uninstall" - QString installerPath; - const auto basenames2 = QStringList{"install-it.sh", "install-it", "installKDE4.sh", - "installKDE4", "install.sh", "install"}; - for (const auto &basename : qAsConst(basenames2)) { + const QStringList basenames2 = {"install-it.sh", "install-it", "installKDE4.sh", + "installKDE4", "install.sh", "install"}; + for (const auto &basename : basenames2) { const auto path = findRecursive(dir, basename); if (!path.isEmpty()) { installerPath = path; @@ -303,8 +300,8 @@ bool cmdUninstall(const QString &archive, QString &errorText) } if (!installerPath.isEmpty()) { - bool ok = runInstallerScript( - installerPath, true, QStringList{"--remove", "--delete", "--uninstall", "--deinstall"}, errorText); + const bool ok = runInstallerScript(installerPath, true, + {"--remove", "--delete", "--uninstall", "--deinstall"}, errorText); if (!ok) { return ok; } @@ -344,11 +341,11 @@ int main(int argc, char *argv[]) const QString archive = args[1]; QString errorText; - if (cmd == "install") { + if (cmd == QLatin1String("install")) { if (!cmdInstall(archive, errorText)) { fail(errorText); } - } else if (cmd == "uninstall") { + } else if (cmd == QLatin1String("uninstall")) { if (!cmdUninstall(archive, errorText)) { fail(errorText); }