summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Manuel <nilslice@gmail.com>2016-12-19 13:47:46 -0800
committerSteve Manuel <nilslice@gmail.com>2016-12-19 13:47:46 -0800
commit9ff792e493a5d7b269ed1be62f74ff1a2c8e04d0 (patch)
treeb01172dcaf9182652106701deb77a6da96162452
parent4739a516cd99c1d6c0dcc8ceae0bc55981f1e9be (diff)
adding possible fix for copying root directories into vendor unnecessarily
-rw-r--r--cmd/ponzu/options.go26
1 files changed, 14 insertions, 12 deletions
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)