commands: Add the common build flags to the config commands

Which allows to see the config with `--theme` applied.

Updates #11018

diff --git a/commands/commandeer.go b/commands/commandeer.go
index 23781f57cb16f77efca3d62c6952494cb0bf0ab0..0ae6aefce05ed9ace6ece77ae6c189779612b09e 100644 (file)
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -520,7 +520,6 @@ func applyLocalFlagsBuildConfig(cmd *cobra.Command, r *rootCommand) {
        cmd.Flags().StringP("cacheDir", "", "", "filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/")
        _ = cmd.Flags().SetAnnotation("cacheDir", cobra.BashCompSubdirsInDir, []string{})
        cmd.Flags().StringP("contentDir", "c", "", "filesystem path to content directory")
-       cmd.Flags().StringP("layoutDir", "l", "", "filesystem path to layout directory")
        _ = cmd.Flags().SetAnnotation("theme", cobra.BashCompSubdirsInDir, []string{"themes"})
 
 }
@@ -534,6 +533,7 @@ func applyLocalFlagsBuild(cmd *cobra.Command, r *rootCommand) {
        cmd.Flags().BoolP("buildExpired", "E", false, "include expired content")
        cmd.Flags().BoolP("ignoreCache", "", false, "ignores the cache directory")
        cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date, author, and CODEOWNERS info to the pages")
+       cmd.Flags().StringP("layoutDir", "l", "", "filesystem path to layout directory")
        cmd.Flags().BoolVar(&r.gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build")
        cmd.Flags().StringVar(&r.poll, "poll", "", "set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes")
        cmd.Flags().BoolVar(&r.panicOnWarning, "panicOnWarning", false, "panic on first WARNING log")

diff --git a/commands/config.go b/commands/config.go
index 5cbcdff2ae0005fd776b3b773975af9f0882793f..44c5a1c32eba76b4eba8784a4c47f67c88769bc5 100644 (file)
--- a/commands/config.go
+++ b/commands/config.go
@@ -95,16 +95,17 @@ func (c *configCommand) Run(ctx context.Context, cd *simplecobra.Commandeer, arg
 }
 
 func (c *configCommand) Init(cd *simplecobra.Commandeer) error {
+       c.r = cd.Root.Command.(*rootCommand)
        cmd := cd.CobraCommand
        cmd.Short = "Print the site configuration"
        cmd.Long = `Print the site configuration, both default and custom settings.`
        cmd.Flags().StringVar(&c.format, "format", "toml", "preferred file format (toml, yaml or json)")
+       applyLocalFlagsBuildConfig(cmd, c.r)
 
        return nil
 }
 
 func (c *configCommand) PreRun(cd, runner *simplecobra.Commandeer) error {
-       c.r = cd.Root.Command.(*rootCommand)
        return nil
 }
 
@@ -179,6 +180,7 @@ func (m *configModMounts) MarshalJSON() ([]byte, error) {
 }
 
 type configMountsCommand struct {
+       r         *rootCommand
        configCmd *configCommand
 }
 
@@ -206,8 +208,10 @@ func (c *configMountsCommand) Run(ctx context.Context, cd *simplecobra.Commandee
 }
 
 func (c *configMountsCommand) Init(cd *simplecobra.Commandeer) error {
+       c.r = cd.Root.Command.(*rootCommand)
        cmd := cd.CobraCommand
        cmd.Short = "Print the configured file mounts"
+       applyLocalFlagsBuildConfig(cmd, c.r)
        return nil
 }