Move shell command to variable

tkw1536 · tkw1536 · commit 6853b33903b1 · 2021-06-07T13:16:45.000-04:00
This commit moves the shell command to be used when executing commands
into a variable, allowing it to be customized at build time using a
command like:

go build -ldflags "-X main.osShell=my-fancy-shell" -o forego
diff --git a/unix.go b/unix.go
@@ -7,6 +7,8 @@ import (
 	"syscall"
 )
 
+var osShell string = "bash"
+
 const osHaveSigTerm = true
 
 func ShellInvocationCommand(interactive bool, root, command string) []string {
@@ -15,7 +17,7 @@ func ShellInvocationCommand(interactive bool, root, command string) []string {
 		shellArgument = "-ic"
 	}
 	shellCommand := fmt.Sprintf("cd \"%s\"; source .profile 2>/dev/null; exec %s", root, command)
-	return []string{"bash", shellArgument, shellCommand}
+	return []string{osShell, shellArgument, shellCommand}
 }
 
 func (p *Process) PlatformSpecificInit() {

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ import (`
`7`	`7`	`"syscall"`
`8`	`8`	`)`
`9`	`9`
	`10`	`+var osShell string = "bash"`
	`11`	`+`
`10`	`12`	`const osHaveSigTerm = true`
`11`	`13`
`12`	`14`	`func ShellInvocationCommand(interactive bool, root, command string) []string {`
`@@ -15,7 +17,7 @@ func ShellInvocationCommand(interactive bool, root, command string) []string {`
`15`	`17`	`shellArgument = "-ic"`
`16`	`18`	`}`
`17`	`19`	`shellCommand := fmt.Sprintf("cd \"%s\"; source .profile 2>/dev/null; exec %s", root, command)`
`18`		`- return []string{"bash", shellArgument, shellCommand}`
	`20`	`+ return []string{osShell, shellArgument, shellCommand}`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`func (p *Process) PlatformSpecificInit() {`