totole/revel-cmd
1
0
Fork 0
mirror of https://github.com/kevin-DL/revel-cmd.git synced 2026-01-11 18:54:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from metafex/master

Browse Source 
Make mustCopyDir follow symlinks.
This commit is contained in:
Justin Li
2014-03-08 16:31:20 -05:00
parent 26262a152b 9a2efe5a6f
commit 13df5509a9
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
revel/util.go
View File

@@ -66,10 +66,19 @@ func mustChmod(filename string, mode os.FileMode) {
// Additionally, the trailing ".template" is stripped from the file name.
// Also, dot files and dot directories are skipped.
func mustCopyDir(destDir, srcDir string, data map[string]interface{}) error {
return filepath.Walk(srcDir, func(srcPath string, info os.FileInfo, err error) error {
var realSrcDir string
// handle symlinked source-direcories
f, err := os.Lstat(srcDir)
if err == nil && f.Mode()&os.ModeSymlink == os.ModeSymlink {
realSrcDir, _ = os.Readlink(srcDir)
} else {
realSrcDir = srcDir
}
return filepath.Walk(realSrcDir, func(srcPath string, info os.FileInfo, err error) error {
// Get the relative path from the source base, and the corresponding path in
// the dest directory.
relSrcPath := strings.TrimLeft(srcPath[len(srcDir):], string(os.PathSeparator))
relSrcPath := strings.TrimLeft(srcPath[len(realSrcDir):], string(os.PathSeparator))
destPath := path.Join(destDir, relSrcPath)
// Skip dot files and dot directories.