Skip to content

Commit

Permalink
Add -version to show version info
Browse files Browse the repository at this point in the history
  • Loading branch information
mozillazg committed May 15, 2018
1 parent 4c5d6a4 commit add6912
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ help:

PROJECT=zkcli
VERSION=$(shell cat main.go |grep 'version = "[0-9]\+.[0-9]\+.[0-9]\+"' | awk -F '"' '{print $$2}')
GIT_COMMIT=$(shell git rev-parse --short HEAD)
BUILT_TIME=$(shell date -u '+%FT%T%z')

GOVERSION=$(shell go version)
GOOS=$(word 1,$(subst /, ,$(lastword $(GOVERSION))))
GOARCH=$(word 2,$(subst /, ,$(lastword $(GOVERSION))))
LDFLAGS="-X main.gitCommit=${GIT_COMMIT} -X main.built=${BUILT_TIME}"

ARCNAME=$(PROJECT)-$(VERSION)-$(GOOS)-$(GOARCH)
RELDIR=$(ARCNAME)
Expand All @@ -20,7 +23,7 @@ release:
rm -rf $(DISTDIR)/$(RELDIR)
mkdir -p $(DISTDIR)/$(RELDIR)
go clean
GOOS=$(GOOS) GOARCH=$(GOARCH) go build
GOOS=$(GOOS) GOARCH=$(GOARCH) go build -ldflags ${LDFLAGS}
cp $(PROJECT)$(SUFFIX_EXE) $(DISTDIR)/$(RELDIR)/
tar czf $(DISTDIR)/$(ARCNAME).tar.gz -C $(DISTDIR) $(RELDIR)
go clean
Expand All @@ -35,4 +38,5 @@ release-all:
lint:
gofmt -s -w .
golint .
golint core
go vet
10 changes: 10 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,25 @@ import (
"github.com/let-us-go/zkcli/core"
)

var gitCommit = "unknown"
var built = "unknown"

const version = "0.1.0"

func main() {
servers := flag.String("s", "127.0.0.1:2181", "Servers")
username := flag.String("u", "", "Username")
password := flag.String("p", "", "Password")
showVersion := flag.Bool("version", false, "Show version info")
flag.Parse()
args := flag.Args()

if *showVersion {
fmt.Printf("Version:\t%s\nGit commit:\t%s\nBuilt: %s\n",
version, gitCommit, built)
os.Exit(0)
}

config := core.NewConfig(strings.Split(*servers, ","))
if *username != "" && *password != "" {
auth := core.NewAuth(
Expand Down

0 comments on commit add6912

Please sign in to comment.