From 528385817750e4228112fc60dc954b177b3b3855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Scha=CC=88fer?= <101886095+PeterSchafer@users.noreply.github.com> Date: Mon, 5 Sep 2022 18:42:07 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20copy=20embedded=20file=20logic=20over?= =?UTF-8?q?=20from=20=E2=80=98cliv2-extensions-init=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: add go license Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: remove placeholder licnese file Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: add simple —about implementation … … combining —about from cliv1 and local output Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: add readme and remove license file Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: update git ignore Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: add generation of 3rd party licenses to Makefile Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: adapt output format of —about Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: adapt go-license usage Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: print license files Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: change installation of go-license Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: fix issue when cross compiling Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: adding manual download for missing licenses Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> chore: remove version prefix “2.0.0-prerelease” Signed-off-by: Peter Schäfer <101886095+PeterSchafer@users.noreply.github.com> --- cliv2/Makefile | 2 +- cliv2/internal/cliv2/cliv2.go | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 {