From 0cc7fae7041061e46768b199996e6d855b9e7609 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 8 Mar 2017 18:39:47 -0300 Subject: [PATCH] Using receiver instead of passing t.Env as parameters --- task.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/task.go b/task.go index f0af7c8e..1896291a 100644 --- a/task.go +++ b/task.go @@ -103,7 +103,7 @@ func RunTask(name string) error { } for i := range t.Cmds { - if err = t.runCommand(i, t.Env); err != nil { + if err = t.runCommand(i); err != nil { return &taskRunError{name, err} } } @@ -128,7 +128,7 @@ func (t *Task) isUpToDate() bool { return generatesMinTime.After(sourcesMaxTime) } -func (t *Task) runCommand(i int, envVariables map[string]string) error { +func (t *Task) runCommand(i int) error { vars, err := t.handleVariables() if err != nil { return err @@ -150,9 +150,9 @@ func (t *Task) runCommand(i int, envVariables map[string]string) error { if dir != "" { cmd.Dir = dir } - if nil != envVariables { - env := os.Environ() - for key, value := range envVariables { + if t.Env != nil { + cmd.Env = os.Environ() + for key, value := range t.Env { replacedValue, err := ReplaceVariables(value, vars) if err != nil { return err @@ -161,9 +161,8 @@ func (t *Task) runCommand(i int, envVariables map[string]string) error { if err != nil { return err } - env = append(env, fmt.Sprintf("%s=%s", replacedKey, replacedValue)) + cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", replacedKey, replacedValue)) } - cmd.Env = env } cmd.Stdin = os.Stdin cmd.Stderr = os.Stderr