always assume copy from stdin

client/processes.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/pkg/term"
+	"golang.org/x/crypto/ssh/terminal"
 )
 
 type Process struct {
@@ -47,7 +47,7 @@ func (c *Client) RunProcessAttached(app, process, command string, in io.Reader,
 
 	ch := make(chan int)
 
-	go copyWithExit(out, r, ch, raw)
+	go copyWithExit(out, r, ch)
 
 	err := c.Stream(fmt.Sprintf("/apps/%s/processes/%s/run", app, process), map[string]string{"Command": command}, in, w)
 
@@ -87,7 +87,7 @@ func (c *Client) StopProcess(app, id string) (*Process, error) {
 	return &process, nil
 }
 
-func copyWithExit(w io.Writer, r io.Reader, ch chan int, raw bool) {
+func copyWithExit(w io.Writer, r io.Reader, ch chan int) {
 	buf := make([]byte, 1024)
 	isTerminalRaw := false
 
@@ -98,14 +98,9 @@ func copyWithExit(w io.Writer, r io.Reader, ch chan int, raw bool) {
 			break
 		}
 
-		// don't make the terminal raw until we've read some data
-		if raw && !isTerminalRaw {
+		if !isTerminalRaw {
 			fd := os.Stdin.Fd()
-			oldState, err := term.SetRawTerminal(fd)
-			if err != nil {
-				break
-			}
-			defer term.RestoreTerminal(fd, oldState)
+			terminal.MakeRaw(int(fd))
 			isTerminalRaw = true
 		}
 

cmd/convox/run.go

@@ -7,6 +7,8 @@ import (
 	"regexp"
 	"strings"
 
+	"golang.org/x/crypto/ssh/terminal"
+
 	"github.com/codegangsta/cli"
 	"github.com/convox/rack/cmd/convox/stdcli"
 )
@@ -36,6 +38,10 @@ func cmdRun(c *cli.Context) {
 		return
 	}
 
+	fd := os.Stdin.Fd()
+	stdinState, err := terminal.GetState(int(fd))
+	defer terminal.Restore(int(fd), stdinState)
+
 	_, app, err := stdcli.DirApp(c, ".")
 
 	if err != nil {
@@ -51,6 +57,7 @@ func cmdRun(c *cli.Context) {
 	ps := c.Args()[0]
 
 	code, err := rackClient(c).RunProcessAttached(app, ps, strings.Join(c.Args()[1:], " "), os.Stdin, os.Stdout, true)
+	terminal.Restore(int(fd), stdinState)
 
 	if err != nil {
 		stdcli.Error(err)