diff --git a/cobra/cmd/add.go b/cobra/cmd/add.go index fb22096a..e82c806c 100644 --- a/cobra/cmd/add.go +++ b/cobra/cmd/add.go @@ -163,11 +163,16 @@ func init() { data := make(map[string]interface{}) data["copyright"] = copyrightLine() - data["license"] = license.Header data["cmdPackage"] = filepath.Base(filepath.Dir(path)) // last dir of path data["parentName"] = parentName data["cmdName"] = cmdName + header, err := executeTemplate(license.Header, data) + if err != nil { + er(err) + } + data["license"] = header + cmdScript, err := executeTemplate(template, data) if err != nil { er(err) diff --git a/cobra/cmd/init.go b/cobra/cmd/init.go index d65e6c8c..05d5f948 100644 --- a/cobra/cmd/init.go +++ b/cobra/cmd/init.go @@ -119,9 +119,15 @@ func main() { ` data := make(map[string]interface{}) data["copyright"] = copyrightLine() - data["license"] = project.License().Header data["importpath"] = path.Join(project.Name(), filepath.Base(project.CmdPath())) + data["appName"] = path.Base(project.Name()) + header, err := executeTemplate(project.License().Header, data) + if err != nil { + er(err) + } + data["license"] = header + mainScript, err := executeTemplate(mainTemplate, data) if err != nil { er(err) @@ -218,9 +224,14 @@ func initConfig() { data := make(map[string]interface{}) data["copyright"] = copyrightLine() data["viper"] = viper.GetBool("useViper") - data["license"] = project.License().Header data["appName"] = path.Base(project.Name()) + header, err := executeTemplate(project.License().Header, data) + if err != nil { + er(err) + } + data["license"] = header + rootCmdScript, err := executeTemplate(template, data) if err != nil { er(err)