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
```

diff --git a/hugolib/site.go b/hugolib/site.go
index c0bce9f06c01a58d3b30c0c0b41ded606ea721e1..45c46130304f2deeec443eecd151af1100d28ca1 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -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,