Fixes #44 version printing (#51)

nordcloud · Dec 28, 2020 · c7c4753 · c7c4753
1 parent 2f45fb5
commit c7c4753
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 REVISION := $(shell git rev-parse HEAD)
 CHANGES := $(shell test -n "$$(git status --porcelain)" && echo '+CHANGES' || true)
 
-LDFLAGS := -X main.Revision=$(REVISION)$(CHANGES)
+LDFLAGS := -X main.Revision=$(REVISION)$(CHANGES) -X main.Version=$(TRAVIS_TAG)
 
 build: build-linux build-osx
 

diff --git a/cmd/assume-role-arn/main.go b/cmd/assume-role-arn/main.go
@@ -212,7 +212,7 @@ func printExport(val *AWSCreds) {
 }
 
 func setEnv(val *AWSCreds) {
-	os.Setenv(prefixEnvVar("AWS_ACCESS_KEY_ID"),val.AccessKeyID)
+	os.Setenv(prefixEnvVar("AWS_ACCESS_KEY_ID"), val.AccessKeyID)
 	os.Setenv(prefixEnvVar("AWS_SECRET_ACCESS_KEY"), val.AccessKey)
 	os.Setenv(prefixEnvVar("AWS_SESSION_TOKEN"), val.SessionToken)
 }
@@ -246,7 +246,7 @@ func runCommand(args []string) error {
 
 func main() {
 	if version {
-		fmt.Fprintf(os.Stderr, "assume-role-arn v%s\n", formattedVersion())
+		fmt.Fprintf(os.Stderr, "assume-role-arn %s\n", formattedVersion())
 		os.Exit(0)
 	}
 

diff --git a/cmd/assume-role-arn/version.go b/cmd/assume-role-arn/version.go
@@ -10,7 +10,7 @@ var Revision string
 
 // Version contains the main version number that is being
 // run at the moment.
-const Version = "0.3.4"
+var Version string
 
 func formattedVersion() string {
 	var versionString strings.Builder