From 751b50e071174981da329d530505971e18e21dde Mon Sep 17 00:00:00 2001
From: Soarinferret <thecodye@kanto.cloud>
Date: Fri, 24 Nov 2023 18:39:20 -0600
Subject: [PATCH 1/2] Fix bug where you cannot use '/usr/bin/env bash' as the
 shell for systems where bash is in a different location

---
 agent/agent.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/agent/agent.go b/agent/agent.go
index 1cc74cf..67afef2 100644
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -306,7 +306,8 @@ func (a *Agent) CmdV2(c *CmdOptions) CmdStatus {
 	} else if c.IsExecutable {
 		envCmd = gocmd.NewCmdOptions(cmdOptions, c.Shell, c.Command) // c.Shell: bin + c.Command: args as one string
 	} else {
-		envCmd = gocmd.NewCmdOptions(cmdOptions, c.Shell, "-c", c.Command) // /bin/bash -c 'ls -l /var/log/...'
+		commandArray := append(strings.Fields(c.Shell), "-c", c.Command)
+		envCmd = gocmd.NewCmdOptions(cmdOptions, commandArray[0], commandArray[1:]...) // /bin/bash -c 'ls -l /var/log/...'
 	}
 
 	var stdoutBuf bytes.Buffer

From 7dc08fdbf3d100cd491fc7776e7d80775ae99f31 Mon Sep 17 00:00:00 2001
From: wh1te909 <dcparsi@gmail.com>
Date: Sat, 23 Dec 2023 16:17:33 -0800
Subject: [PATCH 2/2] bump version

---
 build/rmm.exe.manifest | 2 +-
 build/setup.iss        | 2 +-
 main.go                | 2 +-
 versioninfo.json       | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/rmm.exe.manifest b/build/rmm.exe.manifest
index 108f3cf..126fa9d 100644
--- a/build/rmm.exe.manifest
+++ b/build/rmm.exe.manifest
@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="TacticalRMM"
-    version="2.6.0.0"
+    version="2.6.1.0"
     processorArchitecture="*"/>
  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
    <security>
diff --git a/build/setup.iss b/build/setup.iss
index ed7620d..8c58b27 100644
--- a/build/setup.iss
+++ b/build/setup.iss
@@ -1,5 +1,5 @@
 #define MyAppName "Tactical RMM Agent"
-#define MyAppVersion "2.6.0"
+#define MyAppVersion "2.6.1"
 #define MyAppPublisher "AmidaWare Inc"
 #define MyAppURL "https://github.com/amidaware"
 #define MyAppExeName "tacticalrmm.exe"
diff --git a/main.go b/main.go
index 458525f..382fd5c 100644
--- a/main.go
+++ b/main.go
@@ -25,7 +25,7 @@ import (
 )
 
 var (
-	version = "2.6.0"
+	version = "2.6.1"
 	log     = logrus.New()
 	logFile *os.File
 )
diff --git a/versioninfo.json b/versioninfo.json
index bae1ef1..08967a6 100644
--- a/versioninfo.json
+++ b/versioninfo.json
@@ -3,13 +3,13 @@
         "FileVersion": {
             "Major": 2,
             "Minor": 6,
-            "Patch": 0,
+            "Patch": 1,
             "Build": 0
         },
         "ProductVersion": {
             "Major": 2,
             "Minor": 6,
-            "Patch": 0,
+            "Patch": 1,
             "Build": 0
         },
         "FileFlagsMask": "3f",
@@ -22,14 +22,14 @@
         "Comments": "",
         "CompanyName": "AmidaWare Inc",
         "FileDescription": "Tactical RMM Agent",
-        "FileVersion": "v2.6.0.0",
+        "FileVersion": "v2.6.1.0",
         "InternalName": "tacticalrmm.exe",
         "LegalCopyright": "Copyright (c) 2023 AmidaWare Inc",
         "LegalTrademarks": "",
         "OriginalFilename": "tacticalrmm.exe",
         "PrivateBuild": "",
         "ProductName": "Tactical RMM Agent",
-        "ProductVersion": "v2.6.0.0",
+        "ProductVersion": "v2.6.1.0",
         "SpecialBuild": ""
     },
     "VarFileInfo": {