From: Anthony Fok <foka@debian.org>
Date: Fri, 16 Jan 2015 01:02:19 +0000 (-0700)
Subject: Ensure that BaseUrl used in `hugo server` ends with `/`
X-Git-Tag: v0.13~188
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1cbdd3e5;p=brevno-suite%2Fhugo

Ensure that BaseUrl used in `hugo server` ends with `/`

Fixes #793, #799
---

diff --git a/commands/server.go b/commands/server.go
index 8299a291..98ea60f4 100644
--- a/commands/server.go
+++ b/commands/server.go
@@ -135,6 +135,8 @@ func serve(port int) {
 	}
 }
 
+// fixUrl massages the BaseUrl into a form needed for serving
+// all pages correctly.
 func fixUrl(s string) (string, error) {
 	useLocalhost := false
 	if s == "" {
@@ -144,6 +146,9 @@ func fixUrl(s string) (string, error) {
 	if !strings.HasPrefix(s, "http://") && !strings.HasPrefix(s, "https://") {
 		s = "http://" + s
 	}
+	if !strings.HasSuffix(s, "/") {
+		s = s + "/"
+	}
 	u, err := url.Parse(s)
 	if err != nil {
 		return "", err