Fix --version string and duplicate printing
This commit is contained in:
parent
aee1bfd92e
commit
e9bf47b006
5
Makefile
5
Makefile
|
@ -1,7 +1,6 @@
|
|||
LAST_COMMIT := $(shell git rev-parse --short HEAD)
|
||||
LAST_COMMIT_DATE := $(shell git show -s --format=%ci ${LAST_COMMIT})
|
||||
VERSION := $(shell git describe --tags)
|
||||
BUILDSTR := ${VERSION} (${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
|
||||
VERSION := $(shell git describe --tags --abbrev=0)
|
||||
BUILDSTR := ${VERSION} (\#${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
|
||||
|
||||
BIN := listmonk
|
||||
STATIC := config.toml.sample \
|
||||
|
|
|
@ -71,7 +71,6 @@ var (
|
|||
)
|
||||
|
||||
func init() {
|
||||
lo.Println(buildString)
|
||||
initFlags()
|
||||
|
||||
// Display version.
|
||||
|
@ -80,6 +79,8 @@ func init() {
|
|||
os.Exit(0)
|
||||
}
|
||||
|
||||
lo.Println(buildString)
|
||||
|
||||
// Generate new config.
|
||||
if ko.Bool("new-config") {
|
||||
if err := newConfigFile(); err != nil {
|
||||
|
|
|
@ -32,7 +32,6 @@ var reSemver = regexp.MustCompile(`-(.*)`)
|
|||
func checkUpdates(curVersion string, interval time.Duration, app *App) {
|
||||
// Strip -* suffix.
|
||||
curVersion = reSemver.ReplaceAllString(curVersion, "")
|
||||
|
||||
time.Sleep(time.Second * 1)
|
||||
ticker := time.NewTicker(interval)
|
||||
for ; true; <-ticker.C {
|
||||
|
|
Loading…
Reference in New Issue