mirror of
https://gitea.com/gitea/tea.git
synced 2024-09-01 04:14:18 -04:00
Show more version info (#486)
Reviewed-on: https://gitea.com/gitea/tea/pulls/486 Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-by: Wim <42wim@noreply.gitea.io> Co-authored-by: 6543 <6543@obermui.de> Co-committed-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
65535bd948
commit
f83f579dea
3
Makefile
3
Makefile
@ -24,7 +24,8 @@ endif
|
|||||||
TEA_VERSION_TAG ?= $(shell sed 's/+/_/' <<< $(TEA_VERSION))
|
TEA_VERSION_TAG ?= $(shell sed 's/+/_/' <<< $(TEA_VERSION))
|
||||||
|
|
||||||
TAGS ?=
|
TAGS ?=
|
||||||
LDFLAGS := -X "main.Version=$(TEA_VERSION)" -X "main.Tags=$(TAGS)" -s -w
|
SDK ?= $(shell $(GO) list -f '{{.Version}}' -m code.gitea.io/sdk/gitea)
|
||||||
|
LDFLAGS := -X "main.Version=$(TEA_VERSION)" -X "main.Tags=$(TAGS)" -X "main.SDK=$(SDK)" -s -w
|
||||||
|
|
||||||
# override to allow passing additional goflags via make CLI
|
# override to allow passing additional goflags via make CLI
|
||||||
override GOFLAGS := $(GOFLAGS) -mod=vendor -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
|
override GOFLAGS := $(GOFLAGS) -mod=vendor -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
|
||||||
|
22
main.go
22
main.go
@ -8,6 +8,7 @@ package main // import "code.gitea.io/tea"
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.gitea.io/tea/cmd"
|
"code.gitea.io/tea/cmd"
|
||||||
@ -21,6 +22,9 @@ var Version = "development"
|
|||||||
// Tags holds the build tags used
|
// Tags holds the build tags used
|
||||||
var Tags = ""
|
var Tags = ""
|
||||||
|
|
||||||
|
// SDK holds the sdk version from go.mod
|
||||||
|
var SDK = ""
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
// make parsing tea --version easier, by printing /just/ the version string
|
// make parsing tea --version easier, by printing /just/ the version string
|
||||||
cli.VersionPrinter = func(c *cli.Context) { fmt.Fprintln(c.App.Writer, c.App.Version) }
|
cli.VersionPrinter = func(c *cli.Context) { fmt.Fprintln(c.App.Writer, c.App.Version) }
|
||||||
@ -30,7 +34,7 @@ func main() {
|
|||||||
app.Usage = "command line tool to interact with Gitea"
|
app.Usage = "command line tool to interact with Gitea"
|
||||||
app.Description = appDescription
|
app.Description = appDescription
|
||||||
app.CustomAppHelpTemplate = helpTemplate
|
app.CustomAppHelpTemplate = helpTemplate
|
||||||
app.Version = Version + formatBuiltWith(Tags)
|
app.Version = formatVersion()
|
||||||
app.Commands = []*cli.Command{
|
app.Commands = []*cli.Command{
|
||||||
&cmd.CmdLogin,
|
&cmd.CmdLogin,
|
||||||
&cmd.CmdLogout,
|
&cmd.CmdLogout,
|
||||||
@ -61,12 +65,20 @@ func main() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func formatBuiltWith(Tags string) string {
|
func formatVersion() string {
|
||||||
if len(Tags) == 0 {
|
version := fmt.Sprintf("Version: %s\tgolang: %s",
|
||||||
return ""
|
bold(Version),
|
||||||
|
strings.ReplaceAll(runtime.Version(), "go", ""))
|
||||||
|
|
||||||
|
if len(Tags) != 0 {
|
||||||
|
version += fmt.Sprintf("\tbuilt with: %s", strings.Replace(Tags, " ", ", ", -1))
|
||||||
}
|
}
|
||||||
|
|
||||||
return " built with: " + strings.Replace(Tags, " ", ", ", -1)
|
if len(SDK) != 0 {
|
||||||
|
version += fmt.Sprintf("\tgo-sdk: %s", SDK)
|
||||||
|
}
|
||||||
|
|
||||||
|
return version
|
||||||
}
|
}
|
||||||
|
|
||||||
var appDescription = `tea is a productivity helper for Gitea. It can be used to manage most entities on
|
var appDescription = `tea is a productivity helper for Gitea. It can be used to manage most entities on
|
||||||
|
Loading…
Reference in New Issue
Block a user