Fix ignored --config flag with 'new' command

diff --git a/commands/commands.go b/commands/commands.go
index 1bbcf8038561557706dc2028889f8be3416df4e2..0a6ea8860a9a91b47d92873dd9d9135c345f27bb 100644 (file)
--- a/commands/commands.go
+++ b/commands/commands.go
@@ -18,7 +18,6 @@ import (
        "github.com/gohugoio/hugo/config"
        "github.com/gohugoio/hugo/helpers"
        "github.com/spf13/cobra"
-
        "github.com/spf13/nitro"
 )
 
@@ -46,7 +45,7 @@ func (b *commandsBuilder) addAll() *commandsBuilder {
                newCheckCmd(),
                b.newBenchmarkCmd(),
                newConvertCmd(),
-               newNewCmd(),
+               b.newNewCmd(),
                newListCmd(),
                newImportCmd(),
                newGenCmd(),

diff --git a/commands/new.go b/commands/new.go
index ffca86a3e222a5f759de906ec3bbe975621e87ef..f10369837da37cf38275391646e205b35899f803 100644 (file)
--- a/commands/new.go
+++ b/commands/new.go
@@ -30,16 +30,14 @@ import (
 var _ cmder = (*newCmd)(nil)
 
 type newCmd struct {
-       hugoBuilderCommon
        contentEditor string
        contentType   string
 
-       *baseCmd
+       *baseBuilderCmd
 }
 
-func newNewCmd() *newCmd {
-       cc := &newCmd{}
-       cc.baseCmd = newBaseCmd(&cobra.Command{
+func (b *commandsBuilder) newNewCmd() *newCmd {
+       cmd := &cobra.Command{
                Use:   "new [path]",
                Short: "Create new content for your site",
                Long: `Create a new content file and automatically set the date and title.
@@ -50,17 +48,19 @@ You can also specify the kind with ` + "`-k KIND`" + `.
 If archetypes are provided in your theme or site, they will be used.
 
 Ensure you run this within the root directory of your site.`,
+       }
+
+       cc := &newCmd{baseBuilderCmd: b.newBuilderCmd(cmd)}
 
-               RunE: cc.newContent,
-       })
+       cmd.Flags().StringVarP(&cc.contentType, "kind", "k", "", "content type to create")
+       cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
+       cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
+       cmd.Flags().StringVar(&cc.contentEditor, "editor", "", "edit new content with this editor, if provided")
 
-       cc.cmd.Flags().StringVarP(&cc.contentType, "kind", "k", "", "content type to create")
-       cc.cmd.PersistentFlags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from")
-       cc.cmd.PersistentFlags().SetAnnotation("source", cobra.BashCompSubdirsInDir, []string{})
-       cc.cmd.Flags().StringVar(&cc.contentEditor, "editor", "", "edit new content with this editor, if provided")
+       cmd.AddCommand(newNewSiteCmd().getCommand())
+       cmd.AddCommand(newNewThemeCmd().getCommand())
 
-       cc.cmd.AddCommand(newNewSiteCmd().getCommand())
-       cc.cmd.AddCommand(newNewThemeCmd().getCommand())
+       cmd.RunE = cc.newContent
 
        return cc
 }