create: Fix archetype regression when no archetype file

Fixes #3626

diff --git a/create/content.go b/create/content.go
index e584df73e065ad815167f3dd7aed1a0c12ac0c64..8af417294003abd4881c0569f525038e3faa6cb9 100644 (file)
--- a/create/content.go
+++ b/create/content.go
@@ -36,15 +36,19 @@ func NewContent(
 
        archetypeFilename := findArchetype(ps, kind, ext)
 
-       f, err := ps.Fs.Source.Open(archetypeFilename)
-       if err != nil {
-               return err
-       }
-       defer f.Close()
        // Building the sites can be expensive, so only do it if really needed.
        siteUsed := false
-       if helpers.ReaderContains(f, []byte(".Site")) {
-               siteUsed = true
+
+       if archetypeFilename != "" {
+               f, err := ps.Fs.Source.Open(archetypeFilename)
+               if err != nil {
+                       return err
+               }
+               defer f.Close()
+
+               if helpers.ReaderContains(f, []byte(".Site")) {
+                       siteUsed = true
+               }
        }
 
        s, err := siteFactory(targetPath, siteUsed)

diff --git a/create/content_template_handler.go b/create/content_template_handler.go
index 48e7f3b4bf40fcb829d80f513ca89ea4432165b9..d8c1fc71cbc3b3f783d4dcbc3f9748e001c75c3b 100644 (file)
--- a/create/content_template_handler.go
+++ b/create/content_template_handler.go
@@ -48,11 +48,11 @@ type ArchetypeFileData struct {
 }
 
 const (
-       archetypeTemplateTemplate = `+++
-title = "{{ replace .TranslationBaseName "-" " " | title }}"
-date = {{ .Date }}
-draft = true
-+++`
+       archetypeTemplateTemplate = `---
+title: "{{ replace .TranslationBaseName "-" " " | title }}"
+date: {{ .Date }}
+draft: true
+---`
 )
 
 func executeArcheTypeAsTemplate(s *hugolib.Site, kind, targetPath, archetypeFilename string) ([]byte, error) {

diff --git a/create/content_test.go b/create/content_test.go
index e8857baf235d8185d52e9695165f47137b32f704..bd7c34a1d88c7714e16b5069d11bad716c2d0b1e 100644 (file)
--- a/create/content_test.go
+++ b/create/content_test.go
@@ -46,8 +46,8 @@ func TestNewContent(t *testing.T) {
                {"post", "post/sample-1.md", []string{`title = "Post Arch title"`, `test = "test1"`, "date = \"2015-01-12T19:20:04-07:00\""}},
                {"post", "post/org-1.org", []string{`#+title: ORG-1`}},
                {"emptydate", "post/sample-ed.md", []string{`title = "Empty Date Arch title"`, `test = "test1"`}},
-               {"stump", "stump/sample-2.md", []string{`title = "Sample 2"`}},     // no archetype file
-               {"", "sample-3.md", []string{`title = "Sample 3"`}},                // no archetype
+               {"stump", "stump/sample-2.md", []string{`title: "Sample 2"`}},      // no archetype file
+               {"", "sample-3.md", []string{`title: "Sample 3"`}},                 // no archetype
                {"product", "product/sample-4.md", []string{`title = "SAMPLE-4"`}}, // empty archetype front matter
        }