diff options
| author | nytpu <alex@nytpu.com> | 2021-04-19 10:16:20 -0600 |
|---|---|---|
| committer | nytpu <alex@nytpu.com> | 2021-04-19 10:16:20 -0600 |
| commit | fd2667cb9f6fe15c1770b82372007524aadb1cf0 (patch) | |
| tree | 52c842f9d4b08306e8b91714810044b9040d5cc9 | |
| parent | ffe7a37c66d5cfe3f834951545c562ae3b8dcdaa (diff) | |
move Version and Commit to core
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | comitium.go | 2 | ||||
| -rw-r--r-- | core/entries.go | 6 | ||||
| -rw-r--r-- | core/version.go (renamed from version.go) | 2 |
4 files changed, 7 insertions, 5 deletions
@@ -24,7 +24,7 @@ GO ?= CGO_ENABLED=0 go GOFLAGS ?= #GOLDFLAGS ?= -X main.Version=$(VERSION) -X main.Commit=$(COMMIT) # also strips executable, significantly reduces size -GOLDFLAGS ?= -s -w -X main.Version=$(VERSION) -X main.Commit=$(COMMIT) +GOLDFLAGS ?= -s -w -X golang.nytpu.com/comitium/core.Version=$(VERSION) -X golang.nytpu.com/comitium/core.Commit=$(COMMIT) SCDOC ?= scdoc MKDIR ?= mkdir -p RM ?= rm -f diff --git a/comitium.go b/comitium.go index 2126956..41cd616 100644 --- a/comitium.go +++ b/comitium.go @@ -27,7 +27,7 @@ func main() { os.Exit(0) } if os.Args[1] == "version" { - fmt.Printf("comitium v%v, commit %v\n", Version, Commit) + fmt.Printf("comitium v%v, commit %v\n", core.Version, core.Commit) os.Exit(0) } diff --git a/core/entries.go b/core/entries.go index b1b5c05..f0b0046 100644 --- a/core/entries.go +++ b/core/entries.go @@ -156,12 +156,14 @@ func (d *FullData) WriteFeed(dataPath string) error { } } - rawPage += ` + rawPage += fmt.Sprintf(` --- => https://git.nytpu.com/comitium/about/ aggregated using comitium -` +`, + Version, + ) err := ioutil.WriteFile(path, []byte(rawPage), 0666) if err != nil { diff --git a/version.go b/core/version.go index 113d5f6..45d8ab5 100644 --- a/version.go +++ b/core/version.go @@ -2,7 +2,7 @@ // SPDX-License-Identifier: AGPL-3.0-only // For more license details, see LICENSE or <https://www.gnu.org/licenses/agpl-3.0.html>. -package main +package core // These variables are set by the linker. They can be modified in the Makefile. var ( |