commands: Properly handle CLI slice arguments

Like `--disableKinds` -- this handling was kind of broken when we recently moved this from global vars

See #4607

diff --git a/commands/commands_test.go b/commands/commands_test.go
index 5173e740942407869bc9fb0aed4a547c92c29224..2eefaa2ea2fb7fad3e7ac17e1afbacd442aaa59f 100644 (file)
--- 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 5c301c7fbfba2797a8ee2ce7dc0747bb96f6b31c..41c06c026b98ded90db5d1747e45b07a008e7f69 100644 (file)
--- 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()))
+               }
+
        }
 }