CyberShell/backy
1
1
Fork 0
Code Issues 11 Pull Requests Packages Projects 1 Releases 27 Wiki Activity

Command.Type: scriptFile no longer requests psudoterminal
Some checks failed
ci/woodpecker/push/go-lint Pipeline failed
Details

Browse Source
This commit is contained in:
Andrew Woodlee
2026-02-10 12:00:08 -06:00
parent b2d89352a3
commit 9e3960ce9f
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changes/unreleased/Changed-20260210-115903.yaml Normal file
View File

@@ -0,0 +1,3 @@
kind: Changed
body: 'Command.Type: scriptFile no longer requests psudoterminal'
time: 2026-02-10T11:59:03.24953839-06:00

2
cmd/version.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
const versionStr = "0.11.4" const versionStr = "0.11.5"
var ( var (
versionCmd = &cobra.Command{ versionCmd = &cobra.Command{

19
pkg/backy/ssh.go
View File

@@ -690,18 +690,17 @@ func (command *Command) runScriptFile(session *ssh.Session, cmdCtxLogger, global
if err != nil { if err != nil {
return nil, err return nil, err
} }
// session.Stdin = script session.Stdin = script
modes := ssh.TerminalModes{ // modes := ssh.TerminalModes{
ssh.ECHO: 0, // ssh.ECHO: 0,
ssh.ECHOCTL: 0, // ssh.ECHOCTL: 0,
ssh.TTY_OP_ISPEED: 14400, // ssh.TTY_OP_ISPEED: 14400,
ssh.TTY_OP_OSPEED: 14400, // ssh.TTY_OP_OSPEED: 14400,
} // }
session.RequestPty("xterm", 80, 40, modes) // session.RequestPty("xterm", 80, 40, modes)
stdin, _ := session.StdinPipe()
stdout, stdOutErr := session.StdoutPipe() stdout, stdOutErr := session.StdoutPipe()
if stdOutErr != nil { if stdOutErr != nil {
return nil, fmt.Errorf("error getting stdout pipe: %w", stdOutErr) return nil, fmt.Errorf("error getting stdout pipe: %w", stdOutErr)
@@ -718,8 +717,6 @@ func (command *Command) runScriptFile(session *ssh.Session, cmdCtxLogger, global
LogOutputToFile = true LogOutputToFile = true
} }
stdin.Write(script.Bytes())
stdOutput, stdoOutReadErr := io.ReadAll(stdout) stdOutput, stdoOutReadErr := io.ReadAll(stdout)
if err := session.Wait(); err != nil { if err := session.Wait(); err != nil {
stdOutBuff := bytes.NewBuffer(stdOutput) stdOutBuff := bytes.NewBuffer(stdOutput)