Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-03-09 13:00:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

option to send ssh errors to tty instead of stderr

Browse Source
This commit is contained in:
sawka 2022-09-13 17:10:18 -07:00
parent ec143de8b4
commit 53d710f709
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/shexec/shexec.go
View File

@ -373,10 +373,11 @@ func GetWinsize(p *packet.RunPacketType) *pty.Winsize {
} }
type SSHOpts struct { type SSHOpts struct {
SSHHost string SSHHost string
SSHOptsStr string SSHOptsStr string
SSHIdentity string SSHIdentity string
SSHUser string SSHUser string
SSHErrorsToTty bool
} }
type InstallOpts struct { type InstallOpts struct {
@ -453,7 +454,11 @@ func (opts SSHOpts) MakeSSHExecCmd(remoteCommand string) *exec.Cmd {
moreSSHOpts = append(moreSSHOpts, userOpt) moreSSHOpts = append(moreSSHOpts, userOpt)
} }
// note that SSHOptsStr is *not* escaped // note that SSHOptsStr is *not* escaped
sshCmd := fmt.Sprintf("ssh %s %s %s %s", strings.Join(moreSSHOpts, " "), opts.SSHOptsStr, shellescape.Quote(opts.SSHHost), shellescape.Quote(remoteCommand)) var errFdStr string
if opts.SSHErrorsToTty {
errFdStr = "-E /dev/tty"
}
sshCmd := fmt.Sprintf("ssh %s %s %s %s %s", errFdStr, strings.Join(moreSSHOpts, " "), opts.SSHOptsStr, shellescape.Quote(opts.SSHHost), shellescape.Quote(remoteCommand))
ecmd := exec.Command("bash", "-c", sshCmd) ecmd := exec.Command("bash", "-c", sshCmd)
return ecmd return ecmd
} }