From f396cffa239e948075af2224208671956d8b4a84 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Wed, 11 Apr 2018 10:09:45 +0200 Subject: [PATCH] commands: Fix the config command It now also accepts the `-s` (source) flag. See #4598 --- commands/commands_test.go | 1 + commands/{list_config.go => config.go} | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) rename commands/{list_config.go => config.go} (90%) diff --git a/commands/commands_test.go b/commands/commands_test.go index 4eab9b99..7e590bea 100644 --- a/commands/commands_test.go +++ b/commands/commands_test.go @@ -51,6 +51,7 @@ func TestCommands(t *testing.T) { // no args = hugo build {nil, []string{sourceFlag}, ""}, {nil, []string{sourceFlag, "--renderToMemory"}, ""}, + {[]string{"config"}, []string{sourceFlag}, ""}, {[]string{"benchmark"}, []string{sourceFlag, "-n=1"}, ""}, {[]string{"convert", "toTOML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "toml")}, ""}, {[]string{"convert", "toYAML"}, []string{sourceFlag, "-o=" + filepath.Join(dirOut, "yaml")}, ""}, diff --git a/commands/list_config.go b/commands/config.go similarity index 90% rename from commands/list_config.go rename to commands/config.go index 32b739d8..951b5754 100644 --- a/commands/list_config.go +++ b/commands/config.go @@ -25,6 +25,7 @@ import ( var _ cmder = (*configCmd)(nil) type configCmd struct { + hugoBuilderCommon *baseCmd } @@ -37,11 +38,13 @@ func newConfigCmd() *configCmd { RunE: cc.printConfig, }) + cc.cmd.Flags().StringVarP(&cc.source, "source", "s", "", "filesystem path to read files relative from") + return cc } func (c *configCmd) printConfig(cmd *cobra.Command, args []string) error { - cfg, err := initializeConfig(false, nil, c, nil) + cfg, err := initializeConfig(false, &c.hugoBuilderCommon, c, nil) if err != nil { return err -- 2.30.2