Set output correctly

cmoog · cmoog · commit e341e28a9858 · 2020-07-27T20:48:34.000-05:00
Change-Id: Idc792af25471e7becbac8facd27eb149cfd8514a
diff --git a/cmd/coder/shell.go b/cmd/coder/shell.go
@@ -95,20 +95,21 @@ func runCommand(ctx context.Context, envName string, command string, args []stri
 		env       = findEnv(entClient, envName)
 	)
 
-	termfd := os.Stdin.Fd()
+	termfd := os.Stdout.Fd()
 
 	tty := terminal.IsTerminal(int(termfd))
 	if tty {
-		state, err := xterminal.MakeRaw(termfd)
+		stdinState, err := xterminal.MakeRaw(os.Stdin.Fd())
 		if err != nil {
 			return err
 		}
-		defer func() {
-			err := xterminal.Restore(termfd, state)
-			if err != nil {
-				flog.Error("restore term state: %v", err)
-			}
-		}()
+		defer xterminal.Restore(os.Stdin.Fd(), stdinState)
+
+		stdoutState, err := xterminal.MakeOutputRaw(os.Stdout.Fd())
+		if err != nil {
+			return err
+		}
+		defer xterminal.Restore(os.Stdout.Fd(), stdoutState)
 	}
 
 	ctx, cancel := context.WithCancel(ctx)
@@ -120,13 +121,18 @@ func runCommand(ctx context.Context, envName string, command string, args []stri
 	}
 	go heartbeat(ctx, conn, 15*time.Second)
 
+	term := os.Getenv("TERM")
+	if term == "" {
+		term = "xterm" // TODO: fix this
+	}
+
 	execer := wsep.RemoteExecer(conn)
 	process, err := execer.Start(ctx, wsep.Command{
 		Command: command,
 		Args:    args,
 		TTY:     tty,
 		Stdin:   true,
-		Env:     []string{"TERM=" + os.Getenv("TERM")},
+		Env:     []string{"TERM=" + term},
 	})
 	if err != nil {
 		return err
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module cdr.dev/coder-cli
 go 1.14
 
 require (
-	cdr.dev/wsep v0.0.0-20200727194627-13ef1f8df965
+	cdr.dev/wsep v0.0.0-20200728004104-4f85e914f20c
 	github.com/fatih/color v1.9.0 // indirect
 	github.com/gorilla/websocket v1.4.1
 	github.com/kirsle/configdir v0.0.0-20170128060238-e45d2f54772f
diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 cdr.dev/slog v1.3.0 h1:MYN1BChIaVEGxdS7I5cpdyMC0+WfJfK8BETAfzfLUGQ=
 cdr.dev/slog v1.3.0/go.mod h1:C5OL99WyuOK8YHZdYY57dAPN1jK2WJlCdq2VP6xeQns=
-cdr.dev/wsep v0.0.0-20200727194627-13ef1f8df965 h1:zFpraxgmcgX60oWFs8r1moWFMJ0x945t4moxNb6fjJ8=
-cdr.dev/wsep v0.0.0-20200727194627-13ef1f8df965/go.mod h1:N20HJdMn6q9NG7sjxL4uYdBQBGOf8/6psfdMyuJnYw8=
+cdr.dev/wsep v0.0.0-20200728004104-4f85e914f20c h1:opj4lhqu4wdFQEeoDw2GVp5SB+NxRnMkS8H62kodF1k=
+cdr.dev/wsep v0.0.0-20200728004104-4f85e914f20c/go.mod h1:2VKClUml3gfmLez0gBxTJIjSKszpQotc2ZqPdApfK/Y=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -107,8 +107,6 @@ github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/iamacarpet/go-winpty v1.0.2 h1:jwPVTYrjAHZx6Mcm6K5i9G4opMp5TblEHH5EQCl/Gzw=
-github.com/iamacarpet/go-winpty v1.0.2/go.mod h1:/GHKJicG/EVRQIK1IQikMYBakBkhj/3hTjLgdzYsmpI=
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
