From db3c49d049193e0fc225fe4bdb95712c311d6615 Mon Sep 17 00:00:00 2001 From: Anton Harniakou Date: Sun, 13 Jan 2019 12:44:38 +0300 Subject: [PATCH] Make hugo server -t work again This commit solves an issue where hugo would ignore the cli -t flag and only use a theme defined in config.toml. Also allow -t flag to accept a string slice. Closes #5569 Closes #5061 Related #4868 --- commands/commands.go | 2 +- commands/commands_test.go | 2 +- hugolib/paths/paths.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/commands/commands.go b/commands/commands.go index f835e67a..c2fb9083 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -250,7 +250,7 @@ func (cc *hugoBuilderCommon) handleFlags(cmd *cobra.Command) { cmd.Flags().StringP("cacheDir", "", "", "filesystem path to cache directory. Defaults: $TMPDIR/hugo_cache/") cmd.Flags().BoolP("ignoreCache", "", false, "ignores the cache directory") cmd.Flags().StringP("destination", "d", "", "filesystem path to write files to") - cmd.Flags().StringP("theme", "t", "", "theme to use (located in /themes/THEMENAME/)") + cmd.Flags().StringSliceP("theme", "t", []string{}, "themes to use (located in /themes/THEMENAME/)") cmd.Flags().StringP("themesDir", "", "", "filesystem path to themes directory") cmd.Flags().StringVarP(&cc.baseURL, "baseURL", "b", "", "hostname (and path) to the root, e.g. http://spf13.com/") cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date and author info to the pages") diff --git a/commands/commands_test.go b/commands/commands_test.go index a8cc1d92..57c9d600 100644 --- a/commands/commands_test.go +++ b/commands/commands_test.go @@ -104,7 +104,7 @@ func TestCommandsPersistentFlags(t *testing.T) { assert.Equal("/tmp/mydestination", cfg.GetString("publishDir")) assert.Equal("mycontent", cfg.GetString("contentDir")) assert.Equal("mylayouts", cfg.GetString("layoutDir")) - assert.Equal("mytheme", cfg.GetString("theme")) + assert.Equal([]string{"mytheme"}, cfg.GetStringSlice("theme")) assert.Equal("mythemes", cfg.GetString("themesDir")) assert.Equal("https://example.com/b/", cfg.GetString("baseURL")) diff --git a/hugolib/paths/paths.go b/hugolib/paths/paths.go index 7de0d9ff..df66e2a4 100644 --- a/hugolib/paths/paths.go +++ b/hugolib/paths/paths.go @@ -176,7 +176,7 @@ func New(fs *hugofs.Fs, cfg config.Provider) (*Paths, error) { PaginatePath: cfg.GetString("paginatePath"), } - if cfg.IsSet("allThemes") { + if !cfg.IsSet("theme") && cfg.IsSet("allThemes") { p.AllThemes = cfg.Get("allThemes").([]ThemeConfig) } else { p.AllThemes, err = collectThemeNames(p) -- 2.30.2