From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Sat, 19 Mar 2016 16:17:17 +0000 (+0100)
Subject: Simplify GetDottedRelativePath
X-Git-Tag: v0.16~216
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0a768ec9;p=brevno-suite%2Fhugo

Simplify GetDottedRelativePath
---

diff --git a/helpers/path.go b/helpers/path.go
index 75e46f55..d9efeb24 100644
--- a/helpers/path.go
+++ b/helpers/path.go
@@ -199,18 +199,19 @@ var isFileRe = regexp.MustCompile(".*\\..{1,6}$")
 // Expects a relative path starting after the content directory.
 func GetDottedRelativePath(inPath string) string {
 	inPath = filepath.Clean(filepath.FromSlash(inPath))
+
 	if inPath == "." {
 		return "./"
 	}
-	isFile := isFileRe.MatchString(inPath)
-	if !isFile {
-		if !strings.HasSuffix(inPath, FilePathSeparator) {
-			inPath += FilePathSeparator
-		}
+
+	if !isFileRe.MatchString(inPath) && !strings.HasSuffix(inPath, FilePathSeparator) {
+		inPath += FilePathSeparator
 	}
+
 	if !strings.HasPrefix(inPath, FilePathSeparator) {
 		inPath = FilePathSeparator + inPath
 	}
+
 	dir, _ := filepath.Split(inPath)
 
 	sectionCount := strings.Count(dir, FilePathSeparator)