diff options
| author | Paul Bütow <pbuetow@mimecast.com> | 2020-02-12 22:06:56 +0000 |
|---|---|---|
| committer | Paul Bütow <pbuetow@mimecast.com> | 2020-02-12 22:06:56 +0000 |
| commit | a1a0990f5e261f395a2d699cd7602ca4a6a5b6c4 (patch) | |
| tree | 57b65564af5cb317430142fe7badd08318ccf4c2 | |
| parent | b4176ce3443567b16fef9f91c5a42a63d8d5e026 (diff) | |
bump version
| -rw-r--r-- | internal/io/run/run.go | 5 | ||||
| -rw-r--r-- | internal/server/handlers/runcommand.go | 2 | ||||
| -rw-r--r-- | internal/version/version.go | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/internal/io/run/run.go b/internal/io/run/run.go index b608639..c0c6868 100644 --- a/internal/io/run/run.go +++ b/internal/io/run/run.go @@ -5,7 +5,6 @@ import ( "context" "io" "os/exec" - "strings" "sync" "time" @@ -37,8 +36,8 @@ func (r Run) Start(ctx context.Context, lines chan<- line.Line) (pid int, ec int pid = -1 if len(r.args) > 0 { - logger.Debug(r.commandPath, strings.Join(r.args, " ")) - r.cmd = exec.CommandContext(ctx, r.commandPath, strings.Join(r.args, " ")) + logger.Debug(r.commandPath, r.args, " ") + r.cmd = exec.CommandContext(ctx, r.commandPath, r.args...) } else { logger.Debug(r.commandPath) r.cmd = exec.CommandContext(ctx, r.commandPath) diff --git a/internal/server/handlers/runcommand.go b/internal/server/handlers/runcommand.go index e260060..1ae0fda 100644 --- a/internal/server/handlers/runcommand.go +++ b/internal/server/handlers/runcommand.go @@ -59,7 +59,7 @@ func (r runCommand) start(ctx context.Context, commands []string) { pid, ec, err := r.run.Start(ctx, r.server.lines) if err != nil { - message := fmt.Sprintf("Unable to execute remote command '%s'", command) + message := fmt.Sprintf("Unable to execute remote command '%s'", qualifiedPath, args) logger.Error(r.server.user, message, ec, pid, err) r.server.sendServerMessage(logger.Error(message, ec, pid, err)) r.server.sendServerMessage(fmt.Sprintf(".run exitstatus -%d", ec)) diff --git a/internal/version/version.go b/internal/version/version.go index b3614c5..3925bff 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -11,9 +11,9 @@ const ( // Name of DTail. Name string = "DTail" // Version of DTail. - Version string = "2.1.0" + Version string = "2.1.1" // Additional information for DTail - Additional string = "" + Additional string = "develop" // ProtocolCompat -ibility version. ProtocolCompat string = "2" ) |