Merge pull request #37 from mattn/fix-36

Fix #36

Author: mattn

shellwords_test.go

@@ -85,6 +85,31 @@ func TestShellRun(t *testing.T) {
 	}
 }
 
+func TestShellRunNoEnv(t *testing.T) {
+	old := os.Getenv("SHELL")
+	defer os.Setenv("SHELL", old)
+	os.Unsetenv("SHELL")
+
+	dir, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pwd, err := shellRun("pwd", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	pwd2, err := shellRun("pwd", path.Join(dir, "/_example"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if pwd == pwd2 {
+		t.Fatal("`pwd` should be changed")
+	}
+}
+
 func TestBacktick(t *testing.T) {
 	goversion, err := shellRun("go version", "")
 	if err != nil {

util_go15.go

@@ -1,4 +1,4 @@
-// +build !windows,go1.6
+// +build !windows
 
 package shellwords
 
@@ -10,7 +10,10 @@ import (
 )
 
 func shellRun(line, dir string) (string, error) {
-	shell := os.Getenv("SHELL")
+	var shell string
+	if shell = os.Getenv("SHELL"); shell == "" {
+		shell = "/bin/sh"
+	}
 	cmd := exec.Command(shell, "-c", line)
 	if dir != "" {
 		cmd.Dir = dir

util_posix.go

@@ -1,4 +1,4 @@
-// +build windows,go1.6
+// +build windows
 
 package shellwords
 
@@ -10,7 +10,10 @@ import (
 )
 
 func shellRun(line, dir string) (string, error) {
-	shell := os.Getenv("COMSPEC")
+	var shell string
+	if shell = os.Getenv("COMSPEC"); shell == "" {
+		shell = "cmd"
+	}
 	cmd := exec.Command(shell, "/c", line)
 	if dir != "" {
 		cmd.Dir = dir