From 99b01c5d124d08648d4c9e6754485ea585c42707 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Sun, 10 Nov 2024 15:54:00 +0000
Subject: [PATCH 1/3] hyprpm: fix format

---
 hyprpm/src/core/PluginManager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyprpm/src/core/PluginManager.cpp b/hyprpm/src/core/PluginManager.cpp
index 159b9cd6..ef77f540 100644
--- a/hyprpm/src/core/PluginManager.cpp
+++ b/hyprpm/src/core/PluginManager.cpp
@@ -31,7 +31,7 @@ static std::string execAndGet(std::string cmd) {
     cmd += " 2>&1";
 
     CProcess proc("/bin/sh", {cmd});
-    
+
     if (!proc.runSync())
         return "error";
 

From 9e628067fc54851dc9138c2882abb21f72c5a5a6 Mon Sep 17 00:00:00 2001
From: WavyEbuilder <rahul@sandhuservices.dev>
Date: Sun, 10 Nov 2024 15:54:15 +0000
Subject: [PATCH 2/3] debug: clean up opening of files in HyprCtl (#8401)

`std::ifstream` is more suited than `execAndGet` here.
---
 src/debug/HyprCtl.cpp | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/debug/HyprCtl.cpp b/src/debug/HyprCtl.cpp
index 3e0c75a6..709d8b69 100644
--- a/src/debug/HyprCtl.cpp
+++ b/src/debug/HyprCtl.cpp
@@ -1,6 +1,7 @@
 #include "HyprCtl.hpp"
 
 #include <format>
+#include <fstream>
 #include <netinet/in.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -949,11 +950,27 @@ std::string systemInfoRequest(eHyprCtlOutputFormat format, std::string request)
     const std::string GPUINFO = execAndGet("lspci -vnn | grep VGA");
 #endif
     result += "GPU information: \n" + GPUINFO;
-    if (GPUINFO.contains("NVIDIA") && std::filesystem::exists("/proc/driver/nvidia/version"))
-        result += execAndGet("cat /proc/driver/nvidia/version | grep NVRM");
+    if (GPUINFO.contains("NVIDIA") && std::filesystem::exists("/proc/driver/nvidia/version")) {
+        std::ifstream file("/proc/driver/nvidia/version");
+        std::string   line;
+        if (file.is_open()) {
+            while (std::getline(file, line)) {
+                if (!line.contains("NVRM"))
+                    continue;
+                result += line;
+                result += "\n";
+            }
+        } else
+            result += "error";
+    }
     result += "\n\n";
 
-    result += "os-release: " + execAndGet("cat /etc/os-release") + "\n\n";
+    if (std::ifstream file("/etc/os-release"); file.is_open()) {
+        std::stringstream buffer;
+        buffer << file.rdbuf();
+        result += "os-release: " + buffer.str() + "\n\n";
+    } else
+        result += "os-release: error\n\n";
 
     result += "plugins:\n";
     if (g_pPluginSystem) {

From c10739e6e35c30ef5f273bfe5d219d361a31e226 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Sun, 10 Nov 2024 22:53:11 +0000
Subject: [PATCH 3/3] core: fixup execAndGet

fixes #8410
---
 hyprpm/src/core/PluginManager.cpp | 2 +-
 src/helpers/MiscFunctions.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hyprpm/src/core/PluginManager.cpp b/hyprpm/src/core/PluginManager.cpp
index ef77f540..051ad500 100644
--- a/hyprpm/src/core/PluginManager.cpp
+++ b/hyprpm/src/core/PluginManager.cpp
@@ -30,7 +30,7 @@ using namespace Hyprutils::OS;
 static std::string execAndGet(std::string cmd) {
     cmd += " 2>&1";
 
-    CProcess proc("/bin/sh", {cmd});
+    CProcess proc("/bin/sh", {"-c", cmd});
 
     if (!proc.runSync())
         return "error";
diff --git a/src/helpers/MiscFunctions.cpp b/src/helpers/MiscFunctions.cpp
index 75154796..7b4d63a7 100644
--- a/src/helpers/MiscFunctions.cpp
+++ b/src/helpers/MiscFunctions.cpp
@@ -585,7 +585,7 @@ float vecToRectDistanceSquared(const Vector2D& vec, const Vector2D& p1, const Ve
 
 // Execute a shell command and get the output
 std::string execAndGet(const char* cmd) {
-    CProcess proc("/bin/sh", {cmd});
+    CProcess proc("/bin/sh", {"-c", cmd});
 
     if (!proc.runSync())
         return "error";