File 0001-Split-args-in-RunScript-again.patch of Package powerdevil5

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Split-args-in-RunScript-again.patch of Package powerdevil5 (Revision b397b7b30526a48a8ead1be0cc348255)

Currently displaying revision b397b7b30526a48a8ead1be0cc348255 , Show latest

From 3946eff8b298da05e0567886fd39283c04da8fef Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Thu, 23 Jul 2020 20:34:52 +0200
Subject: [PATCH] Split args in RunScript again

Commit 93389c736a3bb76daf0d0016c6acfd59fe9cfbf1 ("Port deprecated method")
changed the behaviour to not do argument splitting again. Reintroduce the
old behaviour without using a deprecated method if Qt 5.15 is available.
---
 daemon/actions/bundled/runscript.cpp | 31 +++++++++++++++++++++++++---
 daemon/actions/bundled/runscript.h   |  1 +
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/daemon/actions/bundled/runscript.cpp b/daemon/actions/bundled/runscript.cpp
index c229cb2..ae4adcd 100644
--- a/daemon/actions/bundled/runscript.cpp
+++ b/daemon/actions/bundled/runscript.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "runscript.h"
+#include "powerdevil_debug.h"
 
 #include <QProcess>
 
@@ -41,7 +42,7 @@ RunScript::~RunScript()
 void RunScript::onProfileUnload()
 {
     if (m_scriptPhase == 1) {
-        QProcess::startDetached(m_scriptCommand, QStringList());
+        runCommand();
     }
 }
 
@@ -53,13 +54,13 @@ void RunScript::onWakeupFromIdle()
 void RunScript::onIdleTimeout(int msec)
 {
     Q_UNUSED(msec);
-    QProcess::startDetached(m_scriptCommand, QStringList());
+    runCommand();
 }
 
 void RunScript::onProfileLoad()
 {
     if (m_scriptPhase == 0) {
-        QProcess::startDetached(m_scriptCommand, QStringList());
+        runCommand();
     }
 }
 
@@ -84,5 +85,29 @@ bool RunScript::loadAction(const KConfigGroup& config)
     return true;
 }
 
+void RunScript::runCommand()
+{
+    bool success;
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    QStringList args = QProcess::splitCommand(m_scriptCommand);
+    if (args.isEmpty()) {
+        qCWarning(POWERDEVIL) << "Empty command?";
+        return;
+    }
+
+    QProcess process;
+    process.setProgram(args.takeFirst());
+    process.setArguments(args);
+    success = process.startDetached();
+#else
+    success = QProcess::startDetached(m_scriptCommand);
+#endif
+
+    if (!success) {
+        qCWarning(POWERDEVIL) << "Failed to run" << m_scriptCommand;
+    }
+}
+
 }
 }
diff --git a/daemon/actions/bundled/runscript.h b/daemon/actions/bundled/runscript.h
index 470cf91..ffdede4 100644
--- a/daemon/actions/bundled/runscript.h
+++ b/daemon/actions/bundled/runscript.h
@@ -47,6 +47,7 @@ public:
     bool loadAction(const KConfigGroup& config) override;
 
 private:
+    void runCommand();
     int m_scriptPhase;
     QString m_scriptCommand;
 };
-- 
2.25.1

Places

File 0001-Split-args-in-RunScript-again.patch of Package powerdevil5 (Revision b397b7b30526a48a8ead1be0cc348255)

Places