Merge branch 'master' into feature/quoted-messages

pkg/commands/os.go

@@ -22,7 +22,7 @@ var (
 )
 
 // Platform stores the os state
-type platform struct {
+type Platform struct {
 	os           string
 	shell        string
 	shellArg     string
@@ -32,7 +32,7 @@ type platform struct {
 // OSCommand holds all the os commands
 type OSCommand struct {
 	Log      *logrus.Logger
-	Platform platform
+	Platform *Platform
 }
 
 // NewOSCommand os command runner
@@ -81,17 +81,17 @@ func sanitisedCommandOutput(output []byte, err error) (string, error) {
 	return outputString, nil
 }
 
-func getPlatform() platform {
+func getPlatform() *Platform {
 	switch runtime.GOOS {
 	case "windows":
-		return platform{
+		return &Platform{
 			os:           "windows",
 			shell:        "cmd",
 			shellArg:     "/c",
 			escapedQuote: "\\\"",
 		}
 	default:
-		return platform{
+		return &Platform{
 			os:           runtime.GOOS,
 			shell:        "bash",
 			shellArg:     "-c",

pkg/gui/gui.go

@@ -10,7 +10,6 @@ import (
 	"log"
 	"os"
 	"os/exec"
-	"runtime"
 	"strings"
 	"time"
 
@@ -53,7 +52,7 @@ type guiState struct {
 	ConflictTop       bool
 	Conflicts         []commands.Conflict
 	EditHistory       *stack.Stack
-	Platform          platform
+	Platform          commands.Platform
 	Version           string
 }
 
@@ -68,7 +67,7 @@ func NewGui(log *logrus.Logger, gitCommand *commands.GitCommand, oSCommand *comm
 		ConflictTop:   true,
 		Conflicts:     make([]commands.Conflict, 0),
 		EditHistory:   stack.New(),
-		Platform:      getPlatform(),
+		Platform:      *oSCommand.Platform,
 		Version:       "test version", // TODO: send version in
 	}
 
@@ -81,32 +80,6 @@ func NewGui(log *logrus.Logger, gitCommand *commands.GitCommand, oSCommand *comm
 	}, nil
 }
 
-type platform struct {
-	os           string
-	shell        string
-	shellArg     string
-	escapedQuote string
-}
-
-func getPlatform() platform {
-	switch runtime.GOOS {
-	case "windows":
-		return platform{
-			os:           "windows",
-			shell:        "cmd",
-			shellArg:     "/c",
-			escapedQuote: "\\\"",
-		}
-	default:
-		return platform{
-			os:           runtime.GOOS,
-			shell:        "bash",
-			shellArg:     "-c",
-			escapedQuote: "\"",
-		}
-	}
-}
-
 func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
 	mainView, _ := g.View("main")
 	ox, oy := mainView.Origin()