From 4739a516cd99c1d6c0dcc8ceae0bc55981f1e9be Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Mon, 19 Dec 2016 13:45:43 -0800 Subject: adding possible fix for copying root directories into vendor unnecessarily --- cmd/ponzu/options.go | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/cmd/ponzu/options.go b/cmd/ponzu/options.go index bb105ce..ff18ff1 100644 --- a/cmd/ponzu/options.go +++ b/cmd/ponzu/options.go @@ -204,11 +204,6 @@ func copyFilesWarnConflicts(srcDir, dstDir string, conflicts []string) error { return err } - // skip copy root directory - if path == srcDir { - return nil - } - for _, conflict := range conflicts { if info.Name() == conflict { fmt.Println("Ponzu couldn't fully build your project:") @@ -220,17 +215,20 @@ func copyFilesWarnConflicts(srcDir, dstDir string, conflicts []string) error { } } - if info.IsDir() { - if len(path) > len(srcDir) { - path = path[len(srcDir)+1:] - } - dir := filepath.Join(dstDir, path) - err := os.MkdirAll(dir, os.ModeDir|os.ModePerm) - if err != nil { - return err + // don't copy root directory + if path != srcDir { + if info.IsDir() { + if len(path) > len(srcDir) { + path = path[len(srcDir)+1:] + } + dir := filepath.Join(dstDir, path) + err := os.MkdirAll(dir, os.ModeDir|os.ModePerm) + if err != nil { + return err + } + + return nil } - - return nil } err = copyFile(path, dstDir) -- cgit v1.2.3