From 8287659584267272f428e370aeab48bbeff49f31 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 12 Nov 2019 22:57:36 +1100 Subject: fix up pty fork --- vendor/github.com/jesseduffield/pty/run.go | 8 ++++++-- vendor/modules.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'vendor') 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 -- cgit v1.2.3