From 7b2e1b0be986545f2f137d79c54cd8beff3ce966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Fri, 7 Apr 2017 18:33:28 +0200
Subject: [PATCH] hubolib: Do not add missing trailing slash to command line
 baseURL

This makes it consistent with how it behaves when it's set in config.toml.

This commit also unifies BaseURL in Site.Info so we now have one source for this value.

Fixes #3262
---
 commands/hugo.go         | 3 ---
 hugolib/site.go          | 9 +++++----
 hugolib/site_url_test.go | 4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/commands/hugo.go b/commands/hugo.go
index 6f56ea3db..73dde5d2d 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -317,9 +317,6 @@ func InitializeConfig(subCmdVs ...*cobra.Command) (*deps.DepsCfg, error) {
 	config.Set("logI18nWarnings", logI18nWarnings)
 
 	if baseURL != "" {
-		if !strings.HasSuffix(baseURL, "/") {
-			baseURL = baseURL + "/"
-		}
 		config.Set("baseURL", baseURL)
 	}
 
diff --git a/hugolib/site.go b/hugolib/site.go
index c5f27b28b..768fe147f 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -289,7 +289,6 @@ type SiteInfo struct {
 	_                   [4]byte
 	paginationPageCount uint64
 
-	BaseURL    template.URL
 	Taxonomies TaxonomyList
 	Authors    AuthorList
 	Social     SiteSocial
@@ -329,6 +328,10 @@ func (s *SiteInfo) String() string {
 	return fmt.Sprintf("Site(%q)", s.Title)
 }
 
+func (s *SiteInfo) BaseURL() template.URL {
+	return template.URL(s.s.PathSpec.BaseURL.String())
+}
+
 // Used in tests.
 
 type siteBuilderCfg struct {
@@ -342,7 +345,6 @@ type siteBuilderCfg struct {
 func newSiteInfo(cfg siteBuilderCfg) SiteInfo {
 	return SiteInfo{
 		s:               cfg.s,
-		BaseURL:         template.URL(cfg.baseURL),
 		multilingual:    newMultiLingualForLanguage(cfg.language),
 		PageCollections: cfg.pageCollections,
 		Params:          make(map[string]interface{}),
@@ -1049,7 +1051,6 @@ func (s *Site) initializeSiteInfo() {
 	}
 
 	s.Info = SiteInfo{
-		BaseURL:                        template.URL(helpers.SanitizeURLKeepTrailingSlash(s.Cfg.GetString("baseURL"))),
 		Title:                          lang.GetString("title"),
 		Author:                         lang.GetStringMap("author"),
 		Social:                         lang.GetStringMapString("social"),
@@ -1503,7 +1504,7 @@ func (s *SiteInfo) createNodeMenuEntryURL(in string) string {
 	menuEntryURL := in
 	menuEntryURL = helpers.SanitizeURLKeepTrailingSlash(s.s.PathSpec.URLize(menuEntryURL))
 	if !s.canonifyURLs {
-		menuEntryURL = helpers.AddContextRoot(string(s.BaseURL), menuEntryURL)
+		menuEntryURL = helpers.AddContextRoot(s.s.PathSpec.BaseURL.String(), menuEntryURL)
 	}
 	return menuEntryURL
 }
diff --git a/hugolib/site_url_test.go b/hugolib/site_url_test.go
index 6f75846e7..b655ff11c 100644
--- a/hugolib/site_url_test.go
+++ b/hugolib/site_url_test.go
@@ -57,8 +57,8 @@ func TestShouldNotAddTrailingSlashToBaseURL(t *testing.T) {
 		require.NoError(t, err)
 		s.initializeSiteInfo()
 
-		if s.Info.BaseURL != template.URL(this.expected) {
-			t.Errorf("[%d] got %s expected %s", i, s.Info.BaseURL, this.expected)
+		if s.Info.BaseURL() != template.URL(this.expected) {
+			t.Errorf("[%d] got %s expected %s", i, s.Info.BaseURL(), this.expected)
 		}
 	}
 }