go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-11-23 22:24:45 +02:00
Code Issues Releases Activity

Fixes after updating mvdan.cc/sh

Browse Source
This commit is contained in:
Andrey Nering
2018-09-01 11:02:23 -03:00
parent f4a18e531f
commit 8bdf5c554d
5 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
internal/execext/exec.go
View File

@@ -13,7 +13,6 @@ import (
// RunCommandOptions is the options for the RunCommand func
type RunCommandOptions struct {
Context context.Context
Command string
Dir string
Env []string
@@ -28,7 +27,7 @@ var (
)
// RunCommand runs a shell command
func RunCommand(opts *RunCommandOptions) error {
func RunCommand(ctx context.Context, opts *RunCommandOptions) error {
if opts == nil {
return ErrNilOptions
}
@@ -47,20 +46,27 @@ func RunCommand(opts *RunCommandOptions) error {
return err
}
r := interp.Runner{
Context: opts.Context,
Dir: opts.Dir,
Env: env,
r, err := interp.New(
interp.Dir(opts.Dir),
interp.Env(env),
Exec: interp.DefaultExec,
Open: interp.OpenDevImpls(interp.DefaultOpen),
interp.Module(interp.DefaultExec),
interp.Module(interp.OpenDevImpls(interp.DefaultOpen)),
Stdin: opts.Stdin,
Stdout: opts.Stdout,
Stderr: opts.Stderr,
}
if err = r.Reset(); err != nil {
interp.StdIO(opts.Stdin, opts.Stdout, opts.Stderr),
)
if err != nil {
return err
}
return r.Run(p)
return r.Run(ctx, p)
}
// IsExitError returns true the given error is an exis status error
func IsExitError(err error) bool {
switch err.(type) {
case interp.ExitStatus, interp.ShellExitStatus:
return true
default:
return false
}
}