From 16fad60833a723e7933cb12609b3eb9b1df9a357 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Sun, 27 Dec 2020 16:49:51 -0300 Subject: [PATCH] execext: Small refactor --- internal/execext/exec.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/execext/exec.go b/internal/execext/exec.go index 18cf0437..dae3eb6c 100644 --- a/internal/execext/exec.go +++ b/internal/execext/exec.go @@ -48,14 +48,7 @@ func RunCommand(ctx context.Context, opts *RunCommandOptions) error { r, err := interp.New( interp.Dir(opts.Dir), interp.Env(expand.ListEnviron(environ...)), - - interp.OpenHandler(func(ctx context.Context, path string, flag int, perm os.FileMode) (io.ReadWriteCloser, error) { - if path == "/dev/null" { - return devNull{}, nil - } - return interp.DefaultOpenHandler()(ctx, path, flag, perm) - }), - + interp.OpenHandler(openHandler), interp.StdIO(opts.Stdin, opts.Stdout, opts.Stderr), ) if err != nil { @@ -86,3 +79,10 @@ func Expand(s string) (string, error) { } return "", nil } + +func openHandler(ctx context.Context, path string, flag int, perm os.FileMode) (io.ReadWriteCloser, error) { + if path == "/dev/null" { + return devNull{}, nil + } + return interp.DefaultOpenHandler()(ctx, path, flag, perm) +}