summaryrefslogtreecommitdiff
path: root/cmd/ponzu/options.go
diff options
context:
space:
mode:
authorSteve Manuel <nilslice@gmail.com>2016-12-19 11:06:54 -0800
committerSteve Manuel <nilslice@gmail.com>2016-12-19 11:06:54 -0800
commit268dc651e2d319f8c733f82d4d8694f01ea6030b (patch)
tree79d810f9aafa1868ee0760983937470d0eea3db8 /cmd/ponzu/options.go
parent43fd3472dd9d19aa1f602ce3fd3555f03312b99b (diff)
possibly redundant mkdir for content pre-vendor
Diffstat (limited to 'cmd/ponzu/options.go')
-rw-r--r--cmd/ponzu/options.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/cmd/ponzu/options.go b/cmd/ponzu/options.go
index a7eee35..9c2767f 100644
--- a/cmd/ponzu/options.go
+++ b/cmd/ponzu/options.go
@@ -150,12 +150,12 @@ func vendorCorePackages(path string) error {
return err
}
- // create a user content directory to be vendored
- contentPath := filepath.Join(path, "content")
- err = os.Mkdir(contentPath, os.ModeDir|os.ModePerm)
- if err != nil {
- return err
- }
+ // // create a user content directory to be vendored
+ // contentPath := filepath.Join(path, "content")
+ // err = os.Mkdir(contentPath, os.ModeDir|os.ModePerm)
+ // if err != nil {
+ // return err
+ // }
dirs := []string{"content", "management", "system"}
for _, dir := range dirs {
@@ -166,7 +166,7 @@ func vendorCorePackages(path string) error {
}
// create a user content directory at project root
- contentPath = filepath.Join(path, "content")
+ contentPath := filepath.Join(path, "content")
err = os.Mkdir(contentPath, os.ModeDir|os.ModePerm)
if err != nil {
return err
@@ -251,7 +251,7 @@ func buildPonzuServer(args []string) error {
// copy all ./content files to internal vendor directory
src := "content"
dst := filepath.Join("cmd", "ponzu", "vendor", "github.com", "bosssauce", "ponzu", "content")
- err = copyFilesWarnConflicts(src, dst, nil)
+ err = copyFilesWarnConflicts(src, dst, []string{"doc.go"})
if err != nil {
return err
}