Merge pull request #10 from snonux/master

Allow whitespaces in regexes

5 files changed, 5 insertions, 4 deletions

diff --git a/internal/prompt/prompt.go b/internal/io/prompt/prompt.go
index a438d33..a438d33 100644
--- a/internal/prompt/prompt.go
+++ b/internal/io/prompt/prompt.go
diff --git a/internal/server/handlers/readcommand.go b/internal/server/handlers/readcommand.go
index e4079e8..6ab41cd 100644
--- a/internal/server/handlers/readcommand.go
+++ b/internal/server/handlers/readcommand.go
@@ -27,7 +27,8 @@ func newReadCommand(server *ServerHandler, mode omode.Mode) *readCommand {
 func (r *readCommand) Start(ctx context.Context, argc int, args []string) {
 	regex := "."
 	if argc >= 4 {
-		regex = args[3]
+	    regex = strings.Join(args[3:], " ")
+	    logger.Debug("Joined regex", regex)
 	}
 	if argc < 3 {
 		r.server.sendServerMessage(logger.Warn(r.server.user, commandParseWarning, args, argc))
diff --git a/internal/server/handlers/serverhandler.go b/internal/server/handlers/serverhandler.go
index 3f0d6ce..b840c77 100644
--- a/internal/server/handlers/serverhandler.go
+++ b/internal/server/handlers/serverhandler.go
@@ -172,7 +172,7 @@ func (h *ServerHandler) handleProtocolVersion(args []string) ([]string, int, err
 }
 
 func (h *ServerHandler) handleBase64(args []string, argc int) ([]string, int, error) {
-	err := errors.New("Unable to decode client message")
+	err := errors.New("Unable to decode client message, DTail server and client versions not compatible")
 
 	if argc != 2 || args[0] != "base64" {
 		return args, argc, err
diff --git a/internal/ssh/client/hostkeycallback.go b/internal/ssh/client/hostkeycallback.go
index 7ae2396..d090d7f 100644
--- a/internal/ssh/client/hostkeycallback.go
+++ b/internal/ssh/client/hostkeycallback.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/mimecast/dtail/internal/io/logger"
-	"github.com/mimecast/dtail/internal/prompt"
+	"github.com/mimecast/dtail/internal/io/prompt"
 
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/knownhosts"
diff --git a/internal/version/version.go b/internal/version/version.go
index 3c057df..e3014a4 100644
--- a/internal/version/version.go
+++ b/internal/version/version.go
@@ -11,7 +11,7 @@ const (
 	// Name of DTail.
 	Name string = "DTail"
 	// Version of DTail.
-	Version string = "2.0.0"
+	Version string = "2.0.3"
 	// Additional information for DTail
 	Additional string = ""
 	// ProtocolCompat -ibility version.