hugo

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

Use filepath.Join in locale resource getting

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

1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/tpl/template_resources.go b/tpl/template_resources.go
@@ -158,15 +158,7 @@ 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 := ""
-	workingDir := viper.GetString("WorkingDir")
-	if workingDir != "" {
-		p = workingDir
-		if !strings.HasSuffix(p, helpers.FilePathSeparator) {
-			p = p + helpers.FilePathSeparator
-		}
-	}
-	filename := p + url
+	filename := filepath.Join(viper.GetString("WorkingDir"), url)
 	if e, err := helpers.Exists(filename, fs); !e {
 		return nil, err
 	}