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

Fixes env: remove square braces and evaluate shell (#62)

Browse Source 
Fixes bug #61, and makes `env` work more similar to `vars` by allowing
dynamic shell values to be evaluated as part of `CompiledTask`.
This commit is contained in:
Sindre Røkenes Myren
2017-08-16 13:04:58 +02:00
committed by Andrey Nering
parent 300376b0b1
commit 72bfd94329
5 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
task.go
View File

@@ -109,36 +109,22 @@ func (e *Executor) Run(args ...string) error {
// RunTask runs a task by its name
func (e *Executor) RunTask(ctx context.Context, call Call) error {
origTask, ok := e.Tasks[call.Task]
if !ok {
return &taskNotFoundError{call.Task}
t, err := e.CompiledTask(call)
if err != nil {
return err
}
if !e.Watch && atomic.AddInt32(e.taskCallCount[call.Task], 1) >= MaximumTaskCall {
return &MaximumTaskCallExceededError{task: call.Task}
}
vars, err := e.getVariables(call)
if err != nil {
return err
}
t, err := origTask.CompiledTask(e.Dir, vars)
if err != nil {
return err
}
if err := e.runDeps(ctx, t); err != nil {
return err
}
// FIXME: doing again, since a var may have been overriden
// using the `set:` attribute of a dependecy.
// Remove this when `set` (that is deprecated) be removed
vars, err = e.getVariables(call)
if err != nil {
return err
}
t, err = origTask.CompiledTask(e.Dir, vars)
// FIXME: doing again, since a var may have been overriden using the
// `set:` attribute of a dependecy. Remove this when `set` (that is
// deprecated) be removed.
t, err = e.CompiledTask(call)
if err != nil {
return err
}
@@ -214,7 +200,7 @@ func (t *Task) getEnviron() []string {
}
envs := os.Environ()
for k, v := range t.Env {
for k, v := range t.Env.toStringMap() {
envs = append(envs, fmt.Sprintf("%s=%s", k, v))
}
return envs