Interactive mode preserves existing PATH, to facilitate scripting

Solomon Hykes · Solomon Hykes · commit db4c75f3c1cd · 2013-02-20T14:45:43.000-08:00
diff --git a/client/client.go b/client/client.go
@@ -112,7 +112,7 @@ func InteractiveMode(scripts ...string) error {
 		return err
 	}
 	io.WriteString(rcfile, "enable -n help\n")
-	os.Setenv("PATH", tmp)
+	os.Setenv("PATH", tmp + ":" + os.Getenv("PATH"))
 	os.Setenv("PS1", "\\h docker> ")
 	shell := exec.Command("/bin/bash", append([]string{"--rcfile", rcfile.Name()}, scripts...)...)
 	shell.Stdin = os.Stdin

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ func InteractiveMode(scripts ...string) error {`
`112`	`112`	`return err`
`113`	`113`	`}`
`114`	`114`	`io.WriteString(rcfile, "enable -n help\n")`
`115`		`- os.Setenv("PATH", tmp)`
	`115`	`+ os.Setenv("PATH", tmp + ":" + os.Getenv("PATH"))`
`116`	`116`	`os.Setenv("PS1", "\\h docker> ")`
`117`	`117`	`shell := exec.Command("/bin/bash", append([]string{"--rcfile", rcfile.Name()}, scripts...)...)`
`118`	`118`	`shell.Stdin = os.Stdin`