diff options
| author | Steve Manuel <nilslice@gmail.com> | 2016-12-19 12:28:05 -0800 |
|---|---|---|
| committer | Steve Manuel <nilslice@gmail.com> | 2016-12-19 12:28:05 -0800 |
| commit | 0b54baee6a3999bb8fb717f913fb370a9fc372a3 (patch) | |
| tree | 369d5905f2f719faea08ae07324846b34d1b5c54 /cmd | |
| parent | 9c7f9d5c5a0ee41c405d2ebeb0ad00fe20a09b14 (diff) | |
| parent | 974d3c03e6f8b522b6db88238790497edd299561 (diff) | |
updating imports to match master
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ponzu/contentType.tmpl | 2 | ||||
| -rw-r--r-- | cmd/ponzu/options.go | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/cmd/ponzu/contentType.tmpl b/cmd/ponzu/contentType.tmpl index 381de30..1a57950 100644 --- a/cmd/ponzu/contentType.tmpl +++ b/cmd/ponzu/contentType.tmpl @@ -4,7 +4,7 @@ import ( "fmt" "github.com/ponzu-cms/ponzu/management/editor" - "github.com/ponzu-cms/ponzu/system/item" + "github.com/ponzu-cms/ponzu/system/item" ) type {{ .Name }} struct { diff --git a/cmd/ponzu/options.go b/cmd/ponzu/options.go index 27f752a..841af94 100644 --- a/cmd/ponzu/options.go +++ b/cmd/ponzu/options.go @@ -150,6 +150,13 @@ 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 + // } + dirs := []string{"content", "management", "system"} for _, dir := range dirs { err = os.Rename(filepath.Join(path, dir), filepath.Join(vendorPath, dir)) @@ -243,7 +250,11 @@ func buildPonzuServer(args []string) error { // copy all ./content files to internal vendor directory src := "content" +<<<<<<< HEAD dst := filepath.Join("cmd", "ponzu", "vendor", "github.com", "ponzu-cms", "ponzu", "content") +======= + dst := filepath.Join("cmd", "ponzu", "vendor", "github.com", "bosssauce", "ponzu", "content") +>>>>>>> ponzu-dev err = copyFilesWarnConflicts(src, dst, []string{"doc.go"}) if err != nil { return err |