hugo

commit 8d8e9dde51c50f27ff1709eed30a7c231c13022f
parent b3a70abe40ea6acbeb698fb9acaf6055a9e81d63
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Sun,  7 Feb 2016 02:07:58 +0100

Minor cleanup of some of the resource getting code

Diffstat:
M
tpl/template_resources.go
 | 
13
+++++++------

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/tpl/template_resources.go b/tpl/template_resources.go
@@ -159,18 +159,19 @@ func resGetRemote(url string, fs afero.Fs, hc *http.Client) ([]byte, error) {
 // resGetLocal loads the content of a local file
 func resGetLocal(url string, fs afero.Fs) ([]byte, error) {
 	p := ""
-	if viper.GetString("WorkingDir") != "" {
-		p = viper.GetString("WorkingDir")
-		if helpers.FilePathSeparator != p[len(p)-1:] {
+	workingDir := viper.GetString("WorkingDir")
+	if workingDir != "" {
+		p = workingDir
+		if !strings.HasSuffix(p, helpers.FilePathSeparator) {
 			p = p + helpers.FilePathSeparator
 		}
 	}
-	jFile := p + url
-	if e, err := helpers.Exists(jFile, fs); !e {
+	filename := p + url
+	if e, err := helpers.Exists(filename, fs); !e {
 		return nil, err
 	}
 
-	f, err := fs.Open(jFile)
+	f, err := fs.Open(filename)
 	if err != nil {
 		return nil, err
 	}