1
0
mirror of https://github.com/go-task/task.git synced 2025-06-17 00:17:51 +02:00

Merge branch 'master' into master

This commit is contained in:
Tobias Salzmann
2018-08-01 10:47:25 +02:00
committed by GitHub
56 changed files with 886 additions and 299 deletions

View File

@ -3,14 +3,10 @@ package task
import (
"path/filepath"
"github.com/go-task/task/internal/osext"
"github.com/go-task/task/internal/taskfile"
"github.com/go-task/task/internal/templater"
)
var (
// TaskvarsFilePath file containing additional variables.
TaskvarsFilePath = "Taskvars"
"mvdan.cc/sh/shell"
)
// CompiledTask returns a copy of a task, but replacing variables in almost all
@ -40,7 +36,7 @@ func (e *Executor) CompiledTask(call taskfile.Call) (*taskfile.Task, error) {
Method: r.Replace(origTask.Method),
Prefix: r.Replace(origTask.Prefix),
}
new.Dir, err = osext.Expand(new.Dir)
new.Dir, err = shell.Expand(new.Dir, nil)
if err != nil {
return nil, err
}