Show version string with revision

Makefile

@@ -1,9 +1,8 @@
 NAME := ec2c
 VERSION := v0.1.0
 REVISION := $(shell git rev-parse --short HEAD)
-GOVERSION := $(subst go version ,,$(shell go version))
 
-LDFLAGS := -ldflags="-s -w -X \"main.Version=$(VERSION)\" -X \"main.Revision=$(REVISION)\" -X \"main.GoVersion=$(GOVERSION)\""
+LDFLAGS := -ldflags="-s -w -X \"main.Version=$(VERSION)\" -X \"main.Revision=$(REVISION)\""
 
 DIST_DIRS := find * -type d -exec
 

command/version.go

@@ -16,10 +16,7 @@ type VersionCommand struct {
 func (c *VersionCommand) Run(args []string) int {
 	var versionString bytes.Buffer
 
-	fmt.Fprintf(&versionString, "%s version %s", c.Name, c.Version)
-	if c.Revision != "" {
-		fmt.Fprintf(&versionString, " (%s)", c.Revision)
-	}
+	fmt.Fprintf(&versionString, "%s version %s, build %s", c.Name, c.Version, c.Revision)
 
 	c.Ui.Output(versionString.String())
 	return 0

commands.go

@@ -52,7 +52,7 @@ func Commands(meta *command.Meta) map[string]cli.CommandFactory {
 			return &command.VersionCommand{
 				Meta:     *meta,
 				Version:  Version,
-				Revision: GitCommit,
+				Revision: Revision,
 				Name:     Name,
 			}, nil
 		},

version.go

@@ -1,11 +1,7 @@
 package main
 
 var (
-	Name    string
-	Version string
+	Name     = "ec2c"
+	Version  string
+	Revision string
 )
-
-// GitCommit describes latest commit hash.
-// This value is extracted by git command when building.
-// To set this from outside, use go build -ldflags "-X main.GitCommit \"$(COMMIT)\""
-var GitCommit string