diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-12 22:57:36 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-11-12 22:58:01 +1100 |
| commit | 8287659584267272f428e370aeab48bbeff49f31 (patch) | |
| tree | 02418eaa799cfc5383a7c23090b0ea976e95eeb7 | |
| parent | cf95ab9a283ba444f43f78bd49be43f385de35b6 (diff) | |
fix up pty forkv0.10.5
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | vendor/github.com/jesseduffield/pty/run.go | 8 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
4 files changed, 10 insertions, 4 deletions
@@ -11,7 +11,7 @@ require ( github.com/google/go-cmp v0.3.1 // indirect github.com/integrii/flaggy v1.3.0 github.com/jesseduffield/gocui v0.3.1-0.20191110053728-01cdcccd0508 - github.com/jesseduffield/pty v1.1.3 + github.com/jesseduffield/pty v1.2.1 github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 github.com/jesseduffield/termbox-go v0.0.0-20190630083001-9dd53af7214e // indirect github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 @@ -79,6 +79,8 @@ github.com/jesseduffield/gocui v0.3.1-0.20191110053728-01cdcccd0508 h1:8CPQLUe+0 github.com/jesseduffield/gocui v0.3.1-0.20191110053728-01cdcccd0508/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw= github.com/jesseduffield/pty v1.1.3 h1:JTPQ/bbGH3IBwQhxKZiFxfD4wv7cYrY7LNTwbucsZ64= github.com/jesseduffield/pty v1.1.3/go.mod h1:7jlS40+UhOqkZJDIG1B/H21xnuET/+fvbbnHCa8wSIo= +github.com/jesseduffield/pty v1.2.1 h1:7xYBiwNH0PpWqC8JmvrPq1a/ksNqyCavzWu9pbBGYWI= +github.com/jesseduffield/pty v1.2.1/go.mod h1:7jlS40+UhOqkZJDIG1B/H21xnuET/+fvbbnHCa8wSIo= github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00 h1:+JaOkfBNYQYlGD7dgru8mCwYNEc5tRRI8mThlVANhSM= github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00/go.mod h1:cWNQljQAWYBp4wchyGfql4q2jRNZXxiE1KhVQgz+JaM= github.com/jesseduffield/rollrus v0.0.0-20190701125922-dd028cb0bfd7 h1:CRD7bVjlGIiV+M0jlsa+XWpneW0KY0e7Y4z3GWb5S4o= diff --git a/vendor/github.com/jesseduffield/pty/run.go b/vendor/github.com/jesseduffield/pty/run.go index 2d7f96119..dda19b760 100644 --- a/vendor/github.com/jesseduffield/pty/run.go +++ b/vendor/github.com/jesseduffield/pty/run.go @@ -33,9 +33,13 @@ func StartWithSize(c *exec.Cmd, sz *Winsize) (pty *os.File, err error) { return nil, err } } - c.Stdout = tty + if c.Stdout == nil { + c.Stdout = tty + } + if c.Stderr == nil { + c.Stderr = tty + } c.Stdin = tty - c.Stderr = tty if c.SysProcAttr == nil { c.SysProcAttr = &syscall.SysProcAttr{} } diff --git a/vendor/modules.txt b/vendor/modules.txt index fb7ede230..0e67f8dcd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -34,7 +34,7 @@ github.com/integrii/flaggy github.com/jbenet/go-context/io # github.com/jesseduffield/gocui v0.3.1-0.20191110053728-01cdcccd0508 github.com/jesseduffield/gocui -# github.com/jesseduffield/pty v1.1.3 +# github.com/jesseduffield/pty v1.2.1 github.com/jesseduffield/pty # github.com/jesseduffield/roll v0.0.0-20190629104057-695be2e62b00 github.com/jesseduffield/roll |