NotificationsYou must be signed in to change notification settings
Fork924
Star10.1k

Commit5de812f

committed

fix(agent/agentcontainers): remove shellquote in favor of %q

Shellquote modified `{{.Name}}` to `\{\{.Name}}` breaking Fish, byswitching to quoting each arg individually we should have a moreportable (across shells) implementation.

1 parentcd484db commit5de812fCopy full SHA for 5de812f

File tree

1 file changed

-3

lines changed

agent/agentcontainers
- execer.go

1 file changed

-3

lines changed

`‎agent/agentcontainers/execer.go`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ package agentcontainers`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+"fmt"`
`5`	`6`	`"os/exec"`
`6`	`7`	`"runtime"`
`7`		`-`
`8`		`-"github.com/kballard/go-shellquote"`
	`8`	`+"strings"`
`9`	`9`
`10`	`10`	`"cdr.dev/slog"`
`11`	`11`	`"github.com/coder/coder/v2/agent/agentexec"`
`@@ -56,7 +56,10 @@ func (e *commandEnvExecer) prepare(ctx context.Context, inName string, inArgs ..`
`56`	`56`	`caller="/c"`
`57`	`57`	`}`
`58`	`58`	`name=shell`
`59`		`-args= []string{caller,shellquote.Join(append([]string{inName},inArgs...)...)}`
	`59`	`+for_,arg:=rangeinArgs {`
	`60`	`+args=append(args,fmt.Sprintf("%q",arg))`
	`61`	`+}`
	`62`	`+args= []string{caller,strings.Join(args," ")}`
`60`	`63`	`returnname,args,dir,env`
`61`	`64`	`}`
`62`	`65`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5de812f

File tree

1 file changed

1 file changed

`‎agent/agentcontainers/execer.go`

0 commit comments