diff --git a/package.sh b/package.sh index fa0fec0b9c..31807ef8f3 100755 --- a/package.sh +++ b/package.sh @@ -69,7 +69,8 @@ function build_packages { function setup_version { echo "Changing version from dev to $influxdb_version" - sed -i.bak "s/var version = \"dev\"/var version = \"$influxdb_version\"/" src/server/server.go + sha1=`git rev-list --max-count=1 HEAD` + sed -i.bak -e "s/var version = \"dev\"/var version = \"$influxdb_version\"/" -e "s/var gitSha = \"\"/var gitSha = \"$sha1\"/" src/server/server.go } function revert_version { diff --git a/src/server/server.go b/src/server/server.go index c479db18e7..bd74a2cbb6 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -18,13 +18,14 @@ var fileName = flag.String("config", "config.json.sample", "Config file") var wantsVersion = flag.Bool("version", false, "Get version number") var version = "dev" +var gitSha = "" func main() { runtime.GOMAXPROCS(runtime.NumCPU()) flag.Parse() if wantsVersion != nil && *wantsVersion { - fmt.Printf("InfluxDB v%s\n", version) + fmt.Printf("InfluxDB v%s (git: %s)\n", version, gitSha) return } config := configuration.LoadConfiguration(*fileName)