Skip to content

Commit baac067

Browse files
committed
expand home dir ("~" symbol) on paths
fixes #74
1 parent f4216dd commit baac067

File tree

7 files changed

+196
-5
lines changed

7 files changed

+196
-5
lines changed

Gopkg.lock

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,7 @@
9797
[[constraint]]
9898
branch = "master"
9999
name = "github.com/radovskyb/watcher"
100+
101+
[[constraint]]
102+
branch = "master"
103+
name = "github.com/mitchellh/go-homedir"

internal/status/glob.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ import (
55
"sort"
66

77
"github.com/mattn/go-zglob"
8+
"github.com/mitchellh/go-homedir"
89
)
910

1011
func glob(dir string, globs []string) (files []string, err error) {
1112
for _, g := range globs {
1213
if !filepath.IsAbs(g) {
1314
g = filepath.Join(dir, g)
1415
}
16+
g, err = homedir.Expand(g)
17+
if err != nil {
18+
return nil, err
19+
}
1520
f, err := zglob.Glob(g)
1621
if err != nil {
1722
return nil, err

variables.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
"github.com/go-task/task/internal/execext"
1313

1414
"github.com/Masterminds/sprig"
15+
"github.com/mitchellh/go-homedir"
1516
)
1617

1718
var (
@@ -202,12 +203,11 @@ func (e *Executor) CompiledTask(call Call) (*Task, error) {
202203
return nil, &taskNotFoundError{call.Task}
203204
}
204205

205-
var r varReplacer
206-
if vars, err := e.getVariables(call); err == nil {
207-
r.vars = vars
208-
} else {
206+
vars, err := e.getVariables(call)
207+
if err != nil {
209208
return nil, err
210209
}
210+
r := varReplacer{vars: vars}
211211

212212
new := Task{
213213
Task: origTask.Task,
@@ -221,6 +221,10 @@ func (e *Executor) CompiledTask(call Call) (*Task, error) {
221221
Silent: origTask.Silent,
222222
Method: r.replace(origTask.Method),
223223
}
224+
new.Dir, err = homedir.Expand(new.Dir)
225+
if err != nil {
226+
return nil, err
227+
}
224228
if e.Dir != "" && !filepath.IsAbs(new.Dir) {
225229
new.Dir = filepath.Join(e.Dir, new.Dir)
226230
}

vendor/github.com/mitchellh/go-homedir/LICENSE

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/mitchellh/go-homedir/README.md

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/mitchellh/go-homedir/homedir.go

Lines changed: 137 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)