github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-12-22 20:22:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix issue 411, /path/to/site/archetypes : is a directory error

Browse source
This commit is contained in:
Joel Scoble 2014-08-18 19:52:43 -05:00 committed by spf13
parent e31d460909
commit cece27fa2e
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
create/content.go
View file

@ -30,11 +30,11 @@ import (
) )
func NewContent(kind, name string) (err error) { func NewContent(kind, name string) (err error) {
jww.INFO.Println("attempting to create", name, "of", kind) jww.INFO.Println("attempting to create ", name, "of", kind)
location := FindArchetype(kind) location := FindArchetype(kind)
var by []byte var by []byte
if location != "" { if location != "" {
by, err = ioutil.ReadFile(location) by, err = ioutil.ReadFile(location)
@ -118,11 +118,21 @@ func FindArchetype(kind string) (outpath string) {
} }
for _, x := range search { for _, x := range search {
pathsToCheck := []string{kind + ".md", kind, "default.md", "default"} // If the new content isn't in a subdirectory, kind == "".
// Therefore it should be excluded otherwise `is a directory`
// error will occur. github.com/spf13/hugo/issues/411
var pathsToCheck []string
if kind == "" {
pathsToCheck = []string{"default.md", "default"}
} else {
pathsToCheck = []string{kind + ".md", kind, "default.md", "default"}
}
for _, p := range pathsToCheck { for _, p := range pathsToCheck {
curpath := path.Join(x, p) curpath := path.Join(x, p)
jww.DEBUG.Println("checking", curpath, "for archetypes") jww.DEBUG.Println("checking", curpath, "for archetypes")
if exists, _ := helpers.Exists(curpath); exists { if exists, _ := helpers.Exists(curpath); exists {
jww.INFO.Println("curpath: " + curpath)
return curpath return curpath
} }
} }