Use an init() method to create the HugoInfo instance

See #570

diff --git a/hugolib/hugo.go b/hugolib/hugo.go
index 3e4d02039660ee4e0ccf6559ac3846eb4b4ece29..b90373b3c3721883c12e66d473cd294d1576d2ec 100644 (file)
--- a/hugolib/hugo.go
+++ b/hugolib/hugo.go
@@ -17,14 +17,11 @@ type HugoInfo struct {
        BuildDate  string
 }
 
-func getHugoInfo() *HugoInfo {
-       if hugoInfo == nil {
-               hugoInfo = &HugoInfo{
-                       Version:    Version,
-                       CommitHash: CommitHash,
-                       BuildDate:  BuildDate,
-                       Generator:  `<meta name="generator" content="Hugo ` + Version + `" />`,
-               }
+func init() {
+       hugoInfo = &HugoInfo{
+               Version:    Version,
+               CommitHash: CommitHash,
+               BuildDate:  BuildDate,
+               Generator:  `<meta name="generator" content="Hugo ` + Version + `" />`,
        }
-       return hugoInfo
 }

diff --git a/hugolib/node.go b/hugolib/node.go
index 85cf6aeb68fe2d11a712b390fa483e12d638ed82..0c3ed9ce634e28d791068a1860c6c812df42a35f 100644 (file)
--- a/hugolib/node.go
+++ b/hugolib/node.go
@@ -78,7 +78,7 @@ func (n *Node) IsMenuCurrent(menuId string, inme *MenuEntry) bool {
 }
 
 func (n *Node) Hugo() *HugoInfo {
-       return getHugoInfo()
+       return hugoInfo
 }
 
 func (n *Node) isSameAsDescendantMenu(inme *MenuEntry, parent *MenuEntry) bool {