From 1e01d4b2072c2dbd2ce3c4a0c940c8a07f55e21d Mon Sep 17 00:00:00 2001 From: FUJIWARA Shunichiro Date: Thu, 5 Apr 2018 22:43:18 +0900 Subject: [PATCH] Add version sub command. --- Makefile | 2 +- cmd/ecspresso/main.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9e3dba37..34490d7b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ DATE := $(shell date +%Y-%m-%dT%H:%M:%S%z) .PHONY: test get-deps get-deps-amd64 binary install clean cmd/ecspresso/ecspresso: *.go cmd/ecspresso/*.go - cd cmd/ecspresso && go build -ldflags "-s -w -X main.version=${GIT_VER} -X main.buildDate=${DATE}" -gcflags="-trimpath=${PWD}" + cd cmd/ecspresso && go build -ldflags "-s -w -X main.Version=${GIT_VER} -X main.buildDate=${DATE}" -gcflags="-trimpath=${PWD}" install: cmd/ecspresso/ecspresso install cmd/ecspresso/ecspresso ${GOPATH}/bin diff --git a/cmd/ecspresso/main.go b/cmd/ecspresso/main.go index 095d93fe..fc516e86 100644 --- a/cmd/ecspresso/main.go +++ b/cmd/ecspresso/main.go @@ -1,6 +1,7 @@ package main import ( + "fmt" "log" "os" @@ -9,12 +10,16 @@ import ( kingpin "gopkg.in/alecthomas/kingpin.v2" ) +var Version = "current" + func main() { os.Exit(_main()) } func _main() int { - conf := kingpin.Flag("config", "config file").Required().String() + kingpin.Command("version", "show version") + + conf := kingpin.Flag("config", "config file").String() deploy := kingpin.Command("deploy", "deploy service") deployOption := ecspresso.DeployOption{ @@ -54,6 +59,10 @@ func _main() int { } sub := kingpin.Parse() + if sub == "version" { + fmt.Println("ecspresso", Version) + return 0 + } c := ecspresso.NewDefaultConfig() if err := config.Load(c, *conf); err != nil {