diff options
Diffstat (limited to 'cmd/ponzu/options.go')
| -rw-r--r-- | cmd/ponzu/options.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd/ponzu/options.go b/cmd/ponzu/options.go index 9c2767f..841af94 100644 --- a/cmd/ponzu/options.go +++ b/cmd/ponzu/options.go @@ -53,7 +53,7 @@ func newProjectInDir(path string) error { return createProjInDir(path) } -var ponzuRepo = []string{"github.com", "bosssauce", "ponzu"} +var ponzuRepo = []string{"github.com", "ponzu-cms", "ponzu"} func createProjInDir(path string) error { gopath := os.Getenv("GOPATH") @@ -144,7 +144,7 @@ func createProjInDir(path string) error { } func vendorCorePackages(path string) error { - vendorPath := filepath.Join(path, "cmd", "ponzu", "vendor", "github.com", "bosssauce", "ponzu") + vendorPath := filepath.Join(path, "cmd", "ponzu", "vendor", "github.com", "ponzu-cms", "ponzu") err := os.MkdirAll(vendorPath, os.ModeDir|os.ModePerm) if err != nil { return err @@ -250,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 |