From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sun, 28 Jun 2015 17:27:28 +0000 (+0200)
Subject: Fix watcher detecting changes as static when no theme
X-Git-Tag: v0.15~309
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=033a13e10e5ef42424db72ae45e01380b0d1e07c;p=brevno-suite%2Fhugo

Fix watcher detecting changes as static when no theme

There have been some changes to the ´helpers.GetThemesDirPath()´ so it now returns an empty string when no theme.

This is correct, but it broke the watch service (at lest on OSX), as `strings.HasPrefix("", "somestring") evaluates to true somehow, and content changes are incorrectly branded as static.

There are other issues in there, but that will come later ...

See #1236
---

diff --git a/commands/hugo.go b/commands/hugo.go
index 5cea9d09..c57f5fe4 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -444,7 +444,7 @@ func NewWatcher(port int) error {
 						continue
 					}
 
-					isstatic := strings.HasPrefix(ev.Name, helpers.GetStaticDirPath()) || strings.HasPrefix(ev.Name, helpers.GetThemesDirPath())
+					isstatic := strings.HasPrefix(ev.Name, helpers.GetStaticDirPath()) || (len(helpers.GetThemesDirPath()) > 0 && strings.HasPrefix(ev.Name, helpers.GetThemesDirPath()))
 					staticChanged = staticChanged || isstatic
 					dynamicChanged = dynamicChanged || !isstatic