diff options
| author | Dave Henderson <dhenderson@gmail.com> | 2021-02-28 20:36:22 -0500 |
|---|---|---|
| committer | Dave Henderson <dhenderson@gmail.com> | 2021-02-28 20:48:18 -0500 |
| commit | 6d6dceb55dc497895ef0957cd925f4b342e7ae56 (patch) | |
| tree | d27833ec3ee2c78e29f3de7a6abecac75d4b3245 /template.go | |
| parent | 672aa486e9c5b6af7b65becad8507e5ac577794d (diff) | |
Fix --input-dir=. bug
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Diffstat (limited to 'template.go')
| -rw-r--r-- | template.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/template.go b/template.go index 56e9a262..1eb93380 100644 --- a/template.go +++ b/template.go @@ -165,19 +165,25 @@ func walkDir(dir string, outFileNamer func(string) (string, error), excludeGlob dirStat, err := fs.Stat(dir) if err != nil { - return nil, err + return nil, fmt.Errorf("couldn't stat %s: %w", dir, err) } dirMode := dirStat.Mode() templates := make([]*tplate, 0) matcher := xignore.NewMatcher(fs) - matches, err := matcher.Matches(dir, &xignore.MatchesOptions{ + + // work around bug in xignore - a basedir of '.' doesn't work + basedir := dir + if basedir == "." { + basedir, _ = os.Getwd() + } + matches, err := matcher.Matches(basedir, &xignore.MatchesOptions{ Ignorefile: gomplateignore, Nested: true, // allow nested ignorefile AfterPatterns: excludeGlob, }) if err != nil { - return nil, err + return nil, fmt.Errorf("ignore matching failed for %s: %w", basedir, err) } // Unmatched ignorefile rules's files |
