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 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 @@ 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": {