Mirrors/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-12-16 19:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Using receiver instead of passing t.Env as parameters

Browse Source
This commit is contained in:
Andrey Nering
2017-03-08 18:39:47 -03:00
parent 3e3d8d8181
commit 0cc7fae704
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
task.go
View File

@@ -103,7 +103,7 @@ func RunTask(name string) error {
} }
for i := range t.Cmds { 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} return &taskRunError{name, err}
} }
} }
@@ -128,7 +128,7 @@ func (t *Task) isUpToDate() bool {
return generatesMinTime.After(sourcesMaxTime) 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() vars, err := t.handleVariables()
if err != nil { if err != nil {
return err return err
@@ -150,9 +150,9 @@ func (t *Task) runCommand(i int, envVariables map[string]string) error {
if dir != "" { if dir != "" {
cmd.Dir = dir cmd.Dir = dir
} }
if nil != envVariables { if t.Env != nil {
env := os.Environ() cmd.Env = os.Environ()
for key, value := range envVariables { for key, value := range t.Env {
replacedValue, err := ReplaceVariables(value, vars) replacedValue, err := ReplaceVariables(value, vars)
if err != nil { if err != nil {
return err return err
@@ -161,9 +161,8 @@ func (t *Task) runCommand(i int, envVariables map[string]string) error {
if err != nil { if err != nil {
return err 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.Stdin = os.Stdin
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr