Fix SHELL environment variable

cmoog · cmoog · commit 04eb2b9f7a65 · 2020-07-01T12:55:40.000-05:00
Change-Id: Icc30a29c2b55220bffc854d9848e9c99395f8a5c
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
-.idea
+/.idea/
+/.repo/
 ci/bin
 cmd/coder/coder
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"strings"
 	"time"
 
 	"github.com/spf13/pflag"
@@ -79,22 +80,18 @@ func (cmd *shellCmd) Run(fl *pflag.FlagSet) {
 	}
 	var (
 		envName = fl.Arg(0)
-		command = fl.Arg(1)
 		ctx     = context.Background()
 	)
 
-	var args []string
-	if command != "" {
-		args = fl.Args()[2:]
+	args := []string{"-c"}
+	if fl.Arg(1) == "" {
+		// Bring user into shell if no command is specified.
+		args = append(args, "export SHELL=$(getent passwd $(whoami) | awk -F: '{ print $7 }'); $SHELL")
+	} else {
+		args = append(args, strings.Join(fl.Args()[1:], " "))
 	}
 
-	// Bring user into shell if no command is specified.
-	if command == "" {
-		command = "sh"
-		args = []string{"-c", "exec $(getent passwd $(whoami) | awk -F: '{ print $7 }')"}
-	}
-
-	err := runCommand(ctx, envName, command, args)
+	err := runCommand(ctx, envName, "sh", args)
 	if exitErr, ok := err.(wsep.ExitError); ok {
 		os.Exit(exitErr.Code)
 	}

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 -.idea
 +/.idea/
 +/.repo/
 ci/bin
 cmd/coder/coder