diff --git a/cmd/dstask.go b/cmd/dstask.go index 96e576e7..a773fd31 100644 --- a/cmd/dstask.go +++ b/cmd/dstask.go @@ -11,13 +11,6 @@ import ( "gopkg.in/yaml.v2" ) -var ( - // populated by linker flags, see do-release.sh - GIT_COMMIT = "Unknown" - VERSION = "Unknown" - BUILD_DATE = "Unknown" -) - func main() { dstask.LoadConfigFromEnv() context := dstask.LoadContext() @@ -327,7 +320,12 @@ func main() { } case dstask.CMD_VERSION: - fmt.Printf("Version: %s\nGit commit: %s\nBuild date: %s\n", VERSION, GIT_COMMIT, BUILD_DATE); + fmt.Printf( + "Version: %s\nGit commit: %s\nBuild date: %s\n", + dstask.VERSION, + dstask.GIT_COMMIT, + dstask.BUILD_DATE, + ); case dstask.CMD_COMPLETIONS: // given the entire user's command line arguments as the arguments for diff --git a/const.go b/const.go index 1e92366b..c7734171 100644 --- a/const.go +++ b/const.go @@ -8,6 +8,10 @@ var ( CONTEXT_FILE = "~/.cache/dstask/context" // for CI testing FAKE_PTY = false + // populated by linker flags, see do-release.sh + GIT_COMMIT = "Unknown" + VERSION = "Unknown" + BUILD_DATE = "Unknown" ) const ( diff --git a/do-release.sh b/do-release.sh index 87a776ca..dfca8dc4 100755 --- a/do-release.sh +++ b/do-release.sh @@ -13,7 +13,11 @@ BUILD_DATE=$(date) RELEASE_FILE=RELEASE.md -LDFLAGS="-s -w -X main.GIT_COMMIT=$GIT_COMMIT -X main.VERSION=$VERSION -X \"main.BUILD_DATE=$BUILD_DATE\"" +LDFLAGS="-s -w \ + -X github.com/naggie/dstask.GIT_COMMIT=$GIT_COMMIT \ + -X github.com/naggie/dstask.VERSION=$VERSION \ + -X \"github.com/naggie/dstask.BUILD_DATE=$BUILD_DATE\"\ +" # get release information