cmd/sgblog/main.go | 12 ++++++------
common.go | 2 +-
diff --git a/cmd/sgblog/main.go b/cmd/sgblog/main.go
index 1dd93472cb34953e4888a7ed3b333e3c642cb7bd99677f5951717224ea050ce8..a80d3647f07e93c4bf08e060e8485393144277bc90da549604b4282f0c759568 100644
--- a/cmd/sgblog/main.go
+++ b/cmd/sgblog/main.go
@@ -77,11 +77,11 @@ GitPath string
Branch string
Title string
- BaseURL string
URLPrefix string
- AtomId string
- AtomAuthor string
+ AtomBaseURL string
+ AtomId string
+ AtomAuthor string
CSS string
Webmaster string
@@ -262,8 +262,8 @@ etagHash.Write([]byte(sgblog.Version))
etagHash.Write([]byte(cfg.GitPath))
etagHash.Write([]byte(cfg.Branch))
etagHash.Write([]byte(cfg.Title))
- etagHash.Write([]byte(cfg.BaseURL))
etagHash.Write([]byte(cfg.URLPrefix))
+ etagHash.Write([]byte(cfg.AtomBaseURL))
etagHash.Write([]byte(cfg.AtomId))
etagHash.Write([]byte(cfg.AtomAuthor))
@@ -291,7 +291,7 @@ etagHashForWeb = append(etagHashForWeb, []byte(cfg.CommentsEmail))
}
defaultLinks = append(defaultLinks, ``)
- atomURL := cfg.BaseURL + cfg.URLPrefix + "/" + AtomFeed
+ atomURL := cfg.AtomBaseURL + cfg.URLPrefix + "/" + AtomFeed
defaultLinks = append(defaultLinks, ``)
repo, err = git.PlainOpen(cfg.GitPath)
@@ -494,7 +494,7 @@ Title: lines[0],
ID: "urn:uuid:" + feedId,
Link: []atom.Link{{
Rel: "alternate",
- Href: cfg.BaseURL + cfg.URLPrefix + "/" + commit.Hash.String(),
+ Href: cfg.AtomBaseURL + cfg.URLPrefix + "/" + commit.Hash.String(),
}},
Published: atom.Time(commit.Author.When),
Updated: atom.Time(commit.Author.When),
diff --git a/common.go b/common.go
index 40cfc5cf82299b5fc956e504717057b3e1e82d66388c484137d6ec1bc6580949..708fe305914dba86d595a3c007a60df09c01d973e4be346a62fc7bd80f858020 100644
--- a/common.go
+++ b/common.go
@@ -3,5 +3,5 @@ package sgblog
const (
WhenFmt = "2006-01-02 15:04:05Z07:00"
- Version = "0.3.1"
+ Version = "0.3.2"
)