diff options
author | Steve Manuel <nilslice@gmail.com> | 2016-12-19 13:45:43 -0800 |
---|---|---|
committer | Steve Manuel <nilslice@gmail.com> | 2016-12-19 13:45:43 -0800 |
commit | 4739a516cd99c1d6c0dcc8ceae0bc55981f1e9be (patch) | |
tree | 99d1ac26059c01d6d606598068a384e8c2f4a28e /cmd/ponzu/options.go | |
parent | 3d6a3815d99af7b436ec0742204a1331012b5f2d (diff) |
adding possible fix for copying root directories into vendor unnecessarily
Diffstat (limited to 'cmd/ponzu/options.go')
-rw-r--r-- | cmd/ponzu/options.go | 28 |
1 files 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) |