Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-04-14 11:34:02 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-04-14 12:32:25 +0300
commit27a524b0905ec73c1eef233f94700feb9f465011 (patch)
tree54b52fb75ffc867c1eb6f6da441cb186b900e7d2 /commands
parentbede93de005dcf934f3ec9be6388310ac6c57acd (diff)
commands: Properly handle CLI slice arguments
Like `--disableKinds` -- this handling was kind of broken when we recently moved this from global vars See #4607
Diffstat (limited to 'commands')
-rw-r--r--commands/commands_test.go5
-rw-r--r--commands/hugo.go15
2 files changed, 19 insertions, 1 deletions
diff --git a/commands/commands_test.go b/commands/commands_test.go
index 5173e7409..2eefaa2ea 100644
--- a/commands/commands_test.go
+++ b/commands/commands_test.go
@@ -57,8 +57,10 @@ func TestCommandsPersistentFlags(t *testing.T) {
}{{[]string{"server",
"--config=myconfig.toml",
"--contentDir=mycontent",
+ "--disableKinds=page,home",
"--layoutDir=mylayouts",
"--theme=mytheme",
+ "--gc",
"--themesDir=mythemes",
"--cleanDestinationDir",
"--navigateToChanged",
@@ -100,7 +102,10 @@ func TestCommandsPersistentFlags(t *testing.T) {
assert.Equal("mytheme", cfg.GetString("theme"))
assert.Equal("mythemes", cfg.GetString("themesDir"))
+ assert.Equal([]string{"page", "home"}, cfg.Get("disableKinds"))
+
assert.True(cfg.GetBool("uglyURLs"))
+ assert.True(cfg.GetBool("gc"))
// The flag is named i18n-warnings
assert.True(cfg.GetBool("logI18nWarnings"))
diff --git a/commands/hugo.go b/commands/hugo.go
index 5c301c7fb..41c06c026 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -243,7 +243,20 @@ If you need to set this configuration value from the command line, set it via an
if targetKey != "" {
configKey = targetKey
}
- cfg.Set(configKey, f.Value.String())
+ // Gotta love this API.
+ switch f.Value.Type() {
+ case "bool":
+ bv, _ := flags.GetBool(key)
+ cfg.Set(configKey, bv)
+ case "string":
+ cfg.Set(configKey, f.Value.String())
+ case "stringSlice":
+ bv, _ := flags.GetStringSlice(key)
+ cfg.Set(configKey, bv)
+ default:
+ panic(fmt.Sprintf("update switch with %s", f.Value.Type()))
+ }
+
}
}