totole/revel-cmd
1
0
Fork 0
mirror of https://github.com/kevin-DL/revel-cmd.git synced 2026-01-22 06:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make mustCopyDir follow symlinks.

Browse Source 
Applications symlinked into the GOPATH fail to build properly under
linux, this fixes it.
This commit is contained in:
Michael Eisendle
2014-03-08 14:31:06 +01:00
parent 26262a152b
commit 9a2efe5a6f
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. // Additionally, the trailing ".template" is stripped from the file name.
// Also, dot files and dot directories are skipped. // Also, dot files and dot directories are skipped.
func mustCopyDir(destDir, srcDir string, data map[string]interface{}) error { 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 // Get the relative path from the source base, and the corresponding path in
// the dest directory. // 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) destPath := path.Join(destDir, relSrcPath)
// Skip dot files and dot directories. // Skip dot files and dot directories.