diff --git a/cliv2/Makefile b/cliv2/Makefile index 41250da081..4859d7ba16 100644 --- a/cliv2/Makefile +++ b/cliv2/Makefile @@ -6,7 +6,7 @@ GOHOSTOS = $(shell go env GOHOSTOS) GOHOSTARCH = $(shell go env GOHOSTARCH) HASH = sha HASH_ALGORITHM = 256 -CLI_V2_VERSION_TAG = 2.0.0-prerelease +CLI_V2_VERSION_TAG = CLI_V1_VERSION_TAG = CLI_V1_LOCATION = diff --git a/cliv2/internal/cliv2/cliv2.go b/cliv2/internal/cliv2/cliv2.go index 46f46c2d9d..dd9a6e4bb6 100644 --- a/cliv2/internal/cliv2/cliv2.go +++ b/cliv2/internal/cliv2/cliv2.go @@ -110,7 +110,11 @@ func (c *CLI) ExtractV1Binary() error { } func (c *CLI) GetFullVersion() string { - return c.v2Version + "." + c.v1Version + if len(c.v2Version) > 0 { + return c.v2Version + "." + c.v1Version + } else { + return c.v1Version + } } func (c *CLI) GetIntegrationName() string {