From 2b01c85d14102353015cf6860d30be3d92964495 Mon Sep 17 00:00:00 2001 From: Bjørn Erik Pedersen Date: Mon, 8 Nov 2021 11:50:51 +0100 Subject: Fix path resolution in hugo new With theme and project with content directories and command on the form `hugo new posts/test.md`. Fixes #9129 --- hugolib/filesystems/basefs.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'hugolib/filesystems') diff --git a/hugolib/filesystems/basefs.go b/hugolib/filesystems/basefs.go index cfbd295ba..939d88459 100644 --- a/hugolib/filesystems/basefs.go +++ b/hugolib/filesystems/basefs.go @@ -157,11 +157,14 @@ func (b *BaseFs) AbsProjectContentDir(filename string) (string, string) { if !isAbs { // A filename on the form "posts/mypage.md", put it inside // the first content folder, usually /content. - // The Dirs are ordered with the most important last, so pick that. + // Pick the last project dir (which is probably the most important one). contentDirs := b.SourceFilesystems.Content.Dirs - firstContentDir := contentDirs[len(contentDirs)-1].Meta().Filename - return filename, filepath.Join(firstContentDir, filename) - + for i := len(contentDirs) - 1; i >= 0; i-- { + meta := contentDirs[i].Meta() + if meta.Module == "project" { + return filename, filepath.Join(meta.Filename, filename) + } + } } return "", "" -- cgit v1.2.3