mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
Skip Static directory if its in your content directory
Allows organisation where all source files are in one directory: ``` `config.yaml`: contentdir: "source" staticdir: "source/static" ... . └── source ├── post | ├── firstpost.md // <- http://site.com/post/firstpost.html | └── secondpost.md // <- http://site.com/post/secondpost.html └── static └── css └── site.css // <- http://site.com/css/site.css ```
This commit is contained in:
parent
3c3fc45d3c
commit
0f143dcf14
1 changed files with 5 additions and 1 deletions
|
@ -192,6 +192,8 @@ func (s *Site) initialize() {
|
|||
|
||||
s.checkDirectories()
|
||||
|
||||
staticDir := s.Config.GetAbsPath(s.Config.StaticDir+"/")
|
||||
|
||||
walker := func(path string, fi os.FileInfo, err error) error {
|
||||
if err != nil {
|
||||
PrintErr("Walker: ", err)
|
||||
|
@ -199,6 +201,9 @@ func (s *Site) initialize() {
|
|||
}
|
||||
|
||||
if fi.IsDir() {
|
||||
if (path == staticDir) {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
site.Directories = append(site.Directories, path)
|
||||
return nil
|
||||
} else {
|
||||
|
@ -211,7 +216,6 @@ func (s *Site) initialize() {
|
|||
}
|
||||
|
||||
filepath.Walk(s.absContentDir(), walker)
|
||||
|
||||
s.Info = SiteInfo{
|
||||
BaseUrl: template.URL(s.Config.BaseUrl),
|
||||
Title: s.Config.Title,
|
||||
|
|
Loading…
Reference in a new issue