Commit744693f

committed

sanity check lint rules

1 parent5746401 commit744693fCopy full SHA for 744693f

File tree

+11

-10

lines changed

+11

-10

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ import (`
`30`	`30`
`31`	`31`	`"cdr.dev/slog"`
`32`	`32`
`33`		`-"github.com/coder/coder/v2/agent/agentexec"`
`34`	`33`	`"github.com/coder/coder/v2/agent/usershell"`
`35`	`34`	`"github.com/coder/coder/v2/codersdk"`
`36`	`35`	`"github.com/coder/coder/v2/pty"`
`@@ -726,10 +725,11 @@ func (s *Server) CreateCommand(ctx context.Context, script string, env []string)`
`726`	`725`	`}`
`727`	`726`	`}`
`728`	`727`
`729`		`-cmd,err:=agentexec.PTYCommandContext(ctx,name,args...)`
`730`		`-iferr!=nil {`
`731`		`-returnnil,xerrors.Errorf("pty command context: %w",err)`
`732`		`-}`
	`728`	`+// cmd, err := agentexec.PTYCommandContext(ctx, name, args...)`
	`729`	`+// if err != nil {`
	`730`	`+// return nil, xerrors.Errorf("pty command context: %w", err)`
	`731`	`+// }`
	`732`	`+cmd:=pty.CommandContext(ctx,name,args...)`
`733`	`733`	`cmd.Dir=s.config.WorkingDirectory()`
`734`	`734`
`735`	`735`	`// If the metadata directory doesn't exist, we run the command`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ import (`
`9`	`9`	`"io"`
`10`	`10`	`"net"`
`11`	`11`	`"os"`
	`12`	`+"os/exec"`
`12`	`13`	`"path/filepath"`
`13`	`14`	`"strings"`
`14`	`15`	`"sync"`
`@@ -333,21 +334,21 @@ func (rpty *screenReconnectingPTY) sendCommand(ctx context.Context, command stri`
`333`	`334`	`run:=func() (bool,error) {`
`334`	`335`	`varstdout bytes.Buffer`
`335`	`336`	`//nolint:gosec`
`336`		`-cmd,err:=agentexec.CommandContext(ctx,"screen",`
	`337`	`+cmd:=exec.CommandContext(ctx,"screen",`
`337`	`338`	`// -x targets an attached session.`
`338`	`339`	`"-x",rpty.id,`
`339`	`340`	`// -c is the flag for the config file.`
`340`	`341`	`"-c",rpty.configFile,`
`341`	`342`	`// -X runs a command in the matching session.`
`342`	`343`	`"-X",command,`
`343`	`344`	`)`
`344`		`-iferr!=nil {`
`345`		`-returnfalse,xerrors.Errorf("command context: %w",err)`
`346`		`-}`
	`345`	`+//if err != nil {`
	`346`	`+//return false, xerrors.Errorf("command context: %w", err)`
	`347`	`+//}`
`347`	`348`	`cmd.Env=append(rpty.command.Env,"TERM=xterm-256color")`
`348`	`349`	`cmd.Dir=rpty.command.Dir`
`349`	`350`	`cmd.Stdout=&stdout`
`350`		`-err=cmd.Run()`
	`351`	`+err:=cmd.Run()`
`351`	`352`	`iferr==nil {`
`352`	`353`	`returntrue,nil`
`353`	`354`	`}`

Comments

(0)