From: Ross Lawley <ross.lawley@gmail.com>
Date: Thu, 15 Aug 2013 18:58:34 +0000 (+0100)
Subject: Skip Static directory if its in your content directory
X-Git-Tag: v0.9~155^2
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0f143dcf;p=brevno-suite%2Fhugo

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 c0bce9f0..45c46130 100644
--- 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,