hangar-tech
/
listmonk
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix --version string and duplicate printing

This commit is contained in:
Kailash Nadh 2020-10-18 22:59:22 +05:30
parent aee1bfd92e
commit e9bf47b006
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -1,7 +1,6 @@
LAST_COMMIT := $(shell git rev-parse --short HEAD) LAST_COMMIT := $(shell git rev-parse --short HEAD)
LAST_COMMIT_DATE := $(shell git show -s --format=%ci ${LAST_COMMIT}) VERSION := $(shell git describe --tags --abbrev=0)
VERSION := $(shell git describe --tags) BUILDSTR := ${VERSION} (\#${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
BUILDSTR := ${VERSION} (${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
BIN := listmonk BIN := listmonk
STATIC := config.toml.sample \ STATIC := config.toml.sample \

3
cmd/main.go
View File

@ -71,7 +71,6 @@ var (
) )
func init() { func init() {
lo.Println(buildString)
initFlags() initFlags()
// Display version. // Display version.
@ -80,6 +79,8 @@ func init() {
os.Exit(0) os.Exit(0)
} }
lo.Println(buildString)
// Generate new config. // Generate new config.
if ko.Bool("new-config") { if ko.Bool("new-config") {
if err := newConfigFile(); err != nil { if err := newConfigFile(); err != nil {

1
cmd/updates.go
View File

@ -32,7 +32,6 @@ var reSemver = regexp.MustCompile(`-(.*)`)
func checkUpdates(curVersion string, interval time.Duration, app *App) { func checkUpdates(curVersion string, interval time.Duration, app *App) {
// Strip -* suffix. // Strip -* suffix.
curVersion = reSemver.ReplaceAllString(curVersion, "") curVersion = reSemver.ReplaceAllString(curVersion, "")
time.Sleep(time.Second * 1) time.Sleep(time.Second * 1)
ticker := time.NewTicker(interval) ticker := time.NewTicker(interval)
for ; true; <-ticker.C { for ; true; <-ticker.C {