proper BaseUrl handling (if has trailing slash or not)

1 files changed, 6 insertions, 0 deletions

diff --git a/hugolib/config.go b/hugolib/config.go
index cb54b7374..983aa254f 100644
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"strings"
 )
 
 // config file items
@@ -65,6 +66,11 @@ func SetupConfig(cfgfile *string, path *string) *Config {
 		c.Indexes["tag"] = "tags"
 		c.Indexes["category"] = "categories"
 	}
+
+    if !strings.HasSuffix(c.BaseUrl, "/") {
+        c.BaseUrl = c.BaseUrl + "/"
+    }
+
 	return &c
 }