Commit51fd2d3

authored

fix: Force bash for non-standard flags to exec (#226)

This addresses a regression introduced by#224. POSIX sh does notdefine arguments to the exec built-in, resulting in an error whenusing 'exec -a' to set the process name (argv[0]).This change executes /bin/bash instead of sh, and also changesto use 'exec -l', which automatically handles the hyphen prefixrequired to trigger login shell behavior.This also explicitly runs /bin/sh, aligning the behavior of"coder sh" and the frontend Terminal application.

1 parentc30c076 commit51fd2d3Copy full SHA for 51fd2d3

File tree

1 file changed

-4

lines changed

internal/cmd
- shell.go

1 file changed

-4

lines changed

`‎internal/cmd/shell.go`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -83,15 +83,20 @@ coder sh front-end-dev cat ~/config.json`,
`83`	`83`
`84`	`84`	`funcshell(cmd*cobra.Command,cmdArgs []string)error {`
`85`	`85`	`ctx:=cmd.Context()`
`86`		`-command:="sh"`
`87`		`-args:=[]string{"-c"}`
	`86`	`+varcommandstring`
	`87`	`+varargs []string`
`88`	`88`	`iflen(cmdArgs)>1 {`
	`89`	`+command="/bin/sh"`
	`90`	`+args= []string{"-c"}`
`89`	`91`	`args=append(args,strings.Join(cmdArgs[1:]," "))`
`90`	`92`	`}else {`
`91`	`93`	`// Bring user into shell if no command is specified.`
`92`	`94`	`shell:="$(getent passwd $(id -u) \| cut -d: -f 7)"`
`93`		`-name:="-$(basename "+shell+")"`
`94`		`-args=append(args,fmt.Sprintf("exec -a %q %q",name,shell))`
	`95`	`+`
	`96`	`+// force bash for the '-l' flag to the exec built-in`
	`97`	`+command="/bin/bash"`
	`98`	`+args= []string{"-c"}`
	`99`	`+args=append(args,fmt.Sprintf("exec -l %q",shell))`
`95`	`100`	`}`
`96`	`101`
`97`	`102`	`envName:=cmdArgs[0]`

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!

Commit51fd2d3

File tree

1 file changed

1 file changed

`‎internal/cmd/shell.go`

0 commit comments