From 9ff792e493a5d7b269ed1be62f74ff1a2c8e04d0 Mon Sep 17 00:00:00 2001 From: Steve Manuel Date: Mon, 19 Dec 2016 13:47:46 -0800 Subject: adding possible fix for copying root directories into vendor unnecessarily --- cmd/ponzu/options.go | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'cmd') diff --git a/cmd/ponzu/options.go b/cmd/ponzu/options.go index ff18ff1..7e37255 100644 --- a/cmd/ponzu/options.go +++ b/cmd/ponzu/options.go @@ -215,20 +215,22 @@ func copyFilesWarnConflicts(srcDir, dstDir string, conflicts []string) error { } } - // 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 - } - + if info.IsDir() { + // don't copy root directory + if path == srcDir { return nil } + + 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 } err = copyFile(path, dstDir) -- cgit v1.2.3