From 56985c1093e8cf2e343ee39b4b1b70eef60fe3b5 Mon Sep 17 00:00:00 2001 From: Umar Getagazov Date: Wed, 7 Sep 2022 12:49:42 +0300 Subject: [PATCH] Print "version" instead of "Version+Version" --- version/version.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/version/version.go b/version/version.go index ecee8a9..708a0d6 100644 --- a/version/version.go +++ b/version/version.go @@ -1,16 +1,15 @@ package version import ( - "fmt" "runtime/debug" "strconv" ) // This is set through ldflags='-X ...' in the Makefile -var taggedRelease string = "Unknown" +var taggedRelease string = "unknown" func FormatVersion() string { - var commitHash string = "Unknown" + var commitHash string = "" var dirty string = "" info, ok := debug.ReadBuildInfo() @@ -18,7 +17,10 @@ func FormatVersion() string { if ok { for _, setting := range info.Settings { if setting.Key == "vcs.revision" { - commitHash = setting.Value + commitHash = "+" + setting.Value + if len(commitHash) > 8 { + commitHash = commitHash[:8] + } } else if setting.Key == "vcs.modified" { modified, err := strconv.ParseBool(setting.Value) if err == nil && modified { @@ -28,5 +30,5 @@ func FormatVersion() string { } } - return fmt.Sprintf("%s+%s%s", taggedRelease, commitHash[:7], dirty) + return taggedRelease + commitHash + dirty }