From e1be96634096febbca1826aa2e57f26178da58d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Mun=CC=83oz?= Date: Wed, 6 Sep 2017 11:59:06 -0700 Subject: [PATCH] Unify generation of data for template expansion using ProjectToMap() --- cobra/cmd/init.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/cobra/cmd/init.go b/cobra/cmd/init.go index 149aabe1..f140e42e 100644 --- a/cobra/cmd/init.go +++ b/cobra/cmd/init.go @@ -16,7 +16,6 @@ package cmd import ( "fmt" "os" - "path" "path/filepath" "github.com/spf13/cobra" @@ -117,10 +116,7 @@ func main() { cmd.Execute() } ` - data := make(map[string]interface{}) - data["copyright"] = copyrightLine() - data["license"] = project.License().Header - data["importpath"] = path.Join(project.Name(), filepath.Base(project.CmdPath())) + data := project.ProjectToMap() mainScript, err := executeTemplate(mainTemplate, data) if err != nil { @@ -215,11 +211,8 @@ func initConfig() { }{{ end }} ` - data := make(map[string]interface{}) - data["copyright"] = copyrightLine() + data := project.ProjectToMap() data["viper"] = viper.GetBool("useViper") - data["license"] = project.License().Header - data["appName"] = path.Base(project.Name()) rootCmdScript, err := executeTemplate(template, data) if err != nil {