From 4edff792e8a397b0a9aed63dac05ee9edc3d21db Mon Sep 17 00:00:00 2001 From: Manuel Carmona Date: Fri, 7 Jul 2017 11:20:54 +0200 Subject: [PATCH] added version to cli --- Makefile | 8 ++++++++ README.md | 5 +++++ cli/enry/main.go | 15 +++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 769def5..d653014 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,11 @@ COVERAGE_MODE := atomic LINGUIST_PATH = .linguist +# build CLI +VERSION := $(shell git describe --tags --abbrev=0) +COMMIT := $(shell git rev-parse --short HEAD) +LDFLAGS = -s -X main.Version=$(VERSION) -X main.GitHash=$(COMMIT) + $(LINGUIST_PATH): git clone https://github.com/github/linguist.git $@ @@ -29,3 +34,6 @@ code-generate: $(LINGUIST_PATH) clean: rm -rf $(LINGUIST_PATH) + +build-cli: + go build -o enry -ldflags "$(LDFLAGS)" cli/enry/main.go diff --git a/README.md b/README.md index d2d8914..6192e7b 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,11 @@ The recommended way to install simple-linguist go get gopkg.in/src-d/enry.v1/... ``` +To build enry's CLI you must run + + make build-cli + +it generates a binary in the project's root directory called `enry`. You can move this binary to anywhere in your `PATH`. Examples -------- diff --git a/cli/enry/main.go b/cli/enry/main.go index ce72f55..b4b4927 100644 --- a/cli/enry/main.go +++ b/cli/enry/main.go @@ -13,6 +13,11 @@ import ( "gopkg.in/src-d/enry.v1" ) +var ( + Version = "undefined" + GitHash = "undefined" +) + func main() { flag.Usage = usage breakdownFlag := flag.Bool("breakdown", false, "") @@ -100,8 +105,14 @@ func main() { func usage() { fmt.Fprintf( - os.Stderr, "enry, A simple (and faster) implementation of github/linguist \nusage: %s \n %s [-json] [-breakdown] \n %s [-json] [-breakdown]\n", - os.Args[0], os.Args[0], os.Args[0], + os.Stderr, + ` %[1]s %[2]s commit: %[3]s + enry, A simple (and faster) implementation of github/linguist + usage: %[1]s + %[1]s [-json] [-breakdown] + %[1]s [-json] [-breakdown] +`, + os.Args[0], Version, GitHash, ) }