Commitc301cf0

committed

Execute exec commands in sh

Change-Id: Iddf070b385a92a95933b94f260a5d509a192de5c

1 parentc8cec8e commitc301cf0Copy full SHA for c301cf0

File tree

-10

lines changed

-10

lines changed

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import (`
`5`	`5`	`"io"`
`6`	`6`	`"os"`
`7`	`7`	`"os/signal"`
	`8`	`+"strings"`
`8`	`9`	`"time"`
`9`	`10`
`10`	`11`	`"github.com/spf13/pflag"`
`@@ -79,19 +80,16 @@ func (cmd shellCmd) Run(fl pflag.FlagSet) {`
`79`	`80`	`}`
`80`	`81`	`var (`
`81`	`82`	`envName=fl.Arg(0)`
`82`		`-command=fl.Arg(1)`
`83`	`83`	`ctx=context.Background()`
`84`	`84`	`)`
`85`	`85`
`86`		`-varargs []string`
`87`		`-ifcommand!="" {`
`88`		`-args=fl.Args()[2:]`
`89`		`-}`
`90`		`-`
`91`		`-// Bring user into shell if no command is specified.`
`92`		`-ifcommand=="" {`
`93`		`-command="sh"`
`94`		`-args= []string{"-c","exec $(getent passwd $(whoami) \| awk -F: '{ print $7 }')"}`
	`86`	`+command:="sh"`
	`87`	`+args:= []string{"-c"}`
	`88`	`+iflen(fl.Args())>1 {`
	`89`	`+args=append(args,strings.Join(fl.Args()[1:]," "))`
	`90`	`+}else {`
	`91`	`+// Bring user into shell if no command is specified.`
	`92`	`+args=append(args,"exec $(getent passwd $(whoami) \| awk -F: '{ print $7 }')")`
`95`	`93`	`}`
`96`	`94`
`97`	`95`	`err:=runCommand(ctx,envName,command,args)`

Comments

(0)