more fixes on Windows

cmd.go

@@ -2,6 +2,7 @@ package godo
 
 import (
 	"bytes"
+	"fmt"
 	"os"
 	"os/exec"
 
@@ -82,15 +83,17 @@ func (gcmd *command) runAsync() (err error) {
 
 	// kills previously spawned process (if exists)
 	killSpawned(id)
-	waitExit = true
 	waitgroup.Add(1)
+	waitExit = true
 	go func() {
 		err = cmd.Start()
 		if err != nil {
+			fmt.Println(err.Error())
 			return
 		}
 		spawnedProcesses[id] = cmd.Process
 		c := make(chan error, 1)
+
 		c <- cmd.Wait()
 		_ = <-c
 		waitgroup.Done()

cmd/example/handler.go

@@ -6,5 +6,5 @@ import (
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
-	fmt.Fprintf(w, "Hi there, I love %s!", r.URL.Path[1:])
+	fmt.Fprintf(w, "Hi there, I hate %s!", r.URL.Path[1:])
 }

exec.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -68,7 +67,7 @@ func Start(commandstr string, options ...interface{}) error {
 		if err != nil {
 			return err
 		}
-		executable = path.Base(dir)
+		executable = filepath.Base(dir)
 	}
 
 	cmd := &command{

project_test.go

@@ -231,39 +231,57 @@ func TestBash(t *testing.T) {
 
 func TestLegacyIn(t *testing.T) {
 
-	//// Bash
+	var cat = "cat"
+	if isWindows {
+		cat = "cmd /c type"
+	}
+	//// Run
 
 	// in V2 BashOutput accepts an options map
-	out, err := BashOutput("cat foo.txt", M{"$in": "test"})
+
+	out, err := RunOutput(cat+" foo.txt", M{"$in": "test"})
 	assert.NoError(t, err)
 	assert.Equal(t, "asdf", str.Clean(out))
 
 	// need to support V1 though
-	out, err = BashOutput("cat foo.txt", In{"test"})
+	out, err = RunOutput(cat+" foo.txt", In{"test"})
 	assert.NoError(t, err)
 	assert.Equal(t, "asdf", str.Clean(out))
 
-	//// Run
+	if isWindows {
+		return
+	}
+
+	//// Bash
 
 	// in V2 BashOutput accepts an options map
-	out, err = RunOutput("cat foo.txt", M{"$in": "test"})
+	out, err = BashOutput("cat foo.txt", M{"$in": "test"})
 	assert.NoError(t, err)
 	assert.Equal(t, "asdf", str.Clean(out))
 
 	// need to support V1 though
-	out, err = RunOutput("cat foo.txt", In{"test"})
+	out, err = BashOutput("cat foo.txt", In{"test"})
 	assert.NoError(t, err)
 	assert.Equal(t, "asdf", str.Clean(out))
 }
 
 func TestTemplatedCommands(t *testing.T) {
+	echo := "echo"
+	if isWindows {
+		echo = "cmd /c echo"
+
+	}
 	// in V2 BashOutput accepts an options map
-	out, err := BashOutput("echo {{.name}}", M{"name": "oy"})
+	out, err := RunOutput(echo+" {{.name}}", M{"name": "oy"})
 	assert.NoError(t, err)
 	assert.Equal(t, "oy", str.Clean(out))
 
+	if isWindows {
+		return
+	}
+
 	// in V2 BashOutput accepts an options map
-	out, err = RunOutput("echo {{.name}}", M{"name": "oy"})
+	out, err = BashOutput("echo {{.name}}", M{"name": "oy"})
 	assert.NoError(t, err)
 	assert.Equal(t, "oy", str.Clean(out))
 }