shithub: hugo

Info  •  Files  •  Log  •  Branches

commands: Use paths from PathSpec for walker

--- a/commands/benchmark.go

+++ b/commands/benchmark.go

@@ -49,7 +49,6 @@

 func benchmark(cmd *cobra.Command, args []string) error {

 	cfg, err := InitializeConfig(benchmarkCmd)

-

 	if err != nil {

 		return err

 	}

--- a/commands/hugo.go

+++ b/commands/hugo.go

@@ -616,14 +616,9 @@

 	var a []string

 	dataDir := c.PathSpec().AbsPathify(c.Cfg.GetString("dataDir"))

 	i18nDir := c.PathSpec().AbsPathify(c.Cfg.GetString("i18nDir"))

-	layoutDir := c.PathSpec().AbsPathify(c.Cfg.GetString("layoutDir"))

-	staticDir := c.PathSpec().AbsPathify(c.Cfg.GetString("staticDir"))

-	var themesDir string

+	layoutDir := c.PathSpec().GetLayoutDirPath()

+	staticDir := c.PathSpec().GetStaticDirPath()

-	if c.PathSpec().ThemeSet() {

-		themesDir = c.PathSpec().AbsPathify(c.Cfg.GetString("themesDir") + "/" + c.Cfg.GetString("theme"))

-	}

-

 	walker := func(path string, fi os.FileInfo, err error) error {

 		if err != nil {

 			if path == dataDir && os.IsNotExist(err) {

@@ -686,15 +681,15 @@

 	_ = helpers.SymbolicWalk(c.Fs.Source, dataDir, walker)

 	_ = helpers.SymbolicWalk(c.Fs.Source, c.PathSpec().AbsPathify(c.Cfg.GetString("contentDir")), walker)

 	_ = helpers.SymbolicWalk(c.Fs.Source, i18nDir, walker)

-	_ = helpers.SymbolicWalk(c.Fs.Source, c.PathSpec().AbsPathify(c.Cfg.GetString("layoutDir")), walker)

-

+	_ = helpers.SymbolicWalk(c.Fs.Source, layoutDir, walker)

 	_ = helpers.SymbolicWalk(c.Fs.Source, staticDir, walker)

+

 	if c.PathSpec().ThemeSet() {

+		themesDir := c.PathSpec().GetThemeDir()

 		_ = helpers.SymbolicWalk(c.Fs.Source, filepath.Join(themesDir, "layouts"), walker)

 		_ = helpers.SymbolicWalk(c.Fs.Source, filepath.Join(themesDir, "static"), walker)

 		_ = helpers.SymbolicWalk(c.Fs.Source, filepath.Join(themesDir, "i18n"), walker)

 		_ = helpers.SymbolicWalk(c.Fs.Source, filepath.Join(themesDir, "data"), walker)

-

 	}

 	return a