go/bindata
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #103 from tsu-ku-ne/master

Browse Source 
fix a bug that invalid convert to asset name if recursive
This commit is contained in:
Jim Teeuwen 2015-07-21 11:10:03 +02:00
commit 14ba83ac84
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
convert.go
View File

@ -173,8 +173,9 @@ func findFiles(dir, prefix string, recursive bool, toc *[]Asset, ignore []*regex
if file.IsDir() { if file.IsDir() {
if recursive { if recursive {
recursivePath := filepath.Join(dir, file.Name())
visitedPaths[asset.Path] = true visitedPaths[asset.Path] = true
findFiles(asset.Path, prefix, recursive, toc, ignore, knownFuncs, visitedPaths) findFiles(recursivePath, prefix, recursive, toc, ignore, knownFuncs, visitedPaths)
} }
continue continue
} else if file.Mode()&os.ModeSymlink == os.ModeSymlink { } else if file.Mode()&os.ModeSymlink == os.ModeSymlink {