diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 539b2c6..6c671a9 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,7 +4,7 @@ "version": "2.0.0", "tasks": [ { - "label": "debug", + "label": "build", "type": "shell", "command": "build/build.sh", "problemMatcher": [], diff --git a/build/build.sh b/build/build.sh index 20ac3a3..364539a 100755 --- a/build/build.sh +++ b/build/build.sh @@ -11,4 +11,6 @@ scriptdir=`pwd` cd .. -go build +git_tag=`git describe --exact-match HEAD 2>/dev/null` +git_hash=`git log --pretty=format:'%h' -n 1` +go build -ldflags "-X main.gitTag=$git_tag -X main.gitHash=$git_hash" diff --git a/main.go b/main.go index 1912f75..8675f6f 100644 --- a/main.go +++ b/main.go @@ -8,10 +8,21 @@ import ( "time" ) +var gitTag string +var gitHash string + var gotErrChan = make(chan bool) func getAboutStr() string { - return "kappanhang by Norbert Varga HA2NON and Akos Marton ES1AKOS https://github.com/nonoo/kappanhang" + var v string + if gitTag != "" { + v = gitTag + } else if gitHash != "" { + v = gitTag + } else { + v = "debug" + } + return "kappanhang " + v + " by Norbert Varga HA2NON and Akos Marton ES1AKOS https://github.com/nonoo/kappanhang" } func runControlStream(osSignal chan os.Signal) (shouldExit bool, exitCode int) {