Skip to content

feat: use mvdan/sh's BashOpts #3035

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pd93 wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −12
Open

feat: use mvdan/sh's BashOpts #3035

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions internal/execext/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,20 @@ func RunCommand(ctx context.Context, opts *RunCommandOptions) error {
}
}

// Format bash options into a slice that mvdan/sh understands
var bashOpts []string
if len(opts.BashOpts) > 0 {
bashOpts = append(bashOpts, "-s")
bashOpts = append(bashOpts, opts.BashOpts...)
}

environ := opts.Env
if len(environ) == 0 {
environ = os.Environ()
}

r, err := interp.New(
interp.BashOpts(bashOpts...),
interp.Params(params...),
interp.Env(expand.ListEnviron(environ...)),
interp.ExecHandlers(execHandlers()...),
Expand All @@ -70,18 +78,6 @@ func RunCommand(ctx context.Context, opts *RunCommandOptions) error {

parser := syntax.NewParser()

// Run any shopt commands
if len(opts.BashOpts) > 0 {
shoptCmdStr := fmt.Sprintf("shopt -s %s", strings.Join(opts.BashOpts, " "))
shoptCmd, err := parser.Parse(strings.NewReader(shoptCmdStr), "")
if err != nil {
return err
}
if err := r.Run(ctx, shoptCmd); err != nil {
return err
}
}

// Run the user-defined command
p, err := parser.Parse(strings.NewReader(opts.Command), "")
if err != nil {
Expand Down