go/task
1
0
Fork 0
mirror of https://github.com/go-task/task.git synced 2025-08-10 22:42:19 +02:00
Code Issues Releases Activity

simplify logic to expand included paths

Browse Source
This commit is contained in:
Alexander Mancevice
2021-09-05 10:57:49 -04:00
parent c892d055ed
commit 8d695bc8d7
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
taskfile/read/taskfile.go
View File

@@ -6,7 +6,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
"strings"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
@@ -51,16 +50,13 @@ func Taskfile(dir string, entrypoint string) (*taskfile.Taskfile, error) {
} }
} }
if filepath.IsAbs(includedTask.Taskfile) { path, err := execext.Expand(includedTask.Taskfile)
path = includedTask.Taskfile if err != nil {
} else if strings.HasPrefix(includedTask.Taskfile, "~") { return err
home, err := execext.Expand("~") }
if err != nil {
return err if ! filepath.IsAbs(path) {
} path = filepath.Join(dir, path)
path = strings.Replace(includedTask.Taskfile, "~", home, 1)
} else {
path = filepath.Join(dir, includedTask.Taskfile)
} }
info, err := os.Stat(path) info, err := os.Stat(path)