github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-12-23 19:21:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

commands: Remove accidental and breaking space in baseURL flag

Browse source 
And added key-trimming to prevent future mishaps.

See #4607
This commit is contained in:
Bjørn Erik Pedersen 2018-04-15 09:46:02 +02:00
parent 27a524b090
commit 1b4e0c4161
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
commands/commands_test.go
View file

@ -101,6 +101,7 @@ func TestCommandsPersistentFlags(t *testing.T) {
assert.Equal("mylayouts", cfg.GetString("layoutDir"))
assert.Equal("mytheme", cfg.GetString("theme"))
assert.Equal("mythemes", cfg.GetString("themesDir"))
assert.Equal("https://example.com/b/", cfg.GetString("baseURL"))
assert.Equal([]string{"page", "home"}, cfg.Get("disableKinds"))

3
commands/hugo.go
View file

@ -189,7 +189,7 @@ func initializeFlags(cmd *cobra.Command, cfg config.Provider) {
"templateMetricsHints",
// Moved from vars.
"baseURL ",
"baseURL",
"buildWatch",
"cacheDir",
"cfgFile",
@ -231,6 +231,7 @@ var deprecatedFlags = map[string]bool{
}
func setValueFromFlag(flags *flag.FlagSet, key string, cfg config.Provider, targetKey string) {
key = strings.TrimSpace(key)
if flags.Changed(key) {
if _, deprecated := deprecatedFlags[strings.ToLower(key)]; deprecated {
msg := fmt.Sprintf(`Set "%s = true" in your config.toml.