Improve versioning and building

build.sh

@@ -2,15 +2,7 @@
 
 set -e
 
-VERSION_FROM_GIT=$(git describe --tags)
-BUILD_TIME=$(date +%F)
-echo "$VERSION_FROM_GIT"
-echo "$BUILD_TIME"
-
-echo "package cmd" > cmd/FLEcli_version.go
-echo " " >> cmd/FLEcli_version.go
-echo "//VersionString is the version that will be displayed with the -v switch" >> cmd/FLEcli_version.go
-echo "const VersionString = \"${VERSION_FROM_GIT} (${BUILD_TIME})\"" >> cmd/FLEcli_version.go
+./update-version.sh
 
 go build
 go test ./...

cmd/FLEcli_version.go

@@ -1,4 +1,4 @@
 package cmd
-
+ 
 //VersionString is the version that will be displayed with the -v switch
-const VersionString = "v0.0.0.0-1-gb264805 (2020-07-13)"
+const VersionString = "v0.0.0.0-3-gefb75a4 (2020-07-13)"

full_build.sh

@@ -2,13 +2,15 @@
 
 set -e
 
+echo "Testing..."
+
 go test ./...
 
 mkdir -p executables/windows
 mkdir -p executables/macos
 mkdir -p executables/linux
 
-#Update version
+./update-version.sh
 
 GOOS=windows GOARCH=386 go build -o executables/windows/FLEcli.exe
 GOOS=darwin GOARCH=amd64 go build -o executables/macos/FLEcli

update-version.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+
+VERSION_FROM_GIT=$(git describe --tags)
+BUILD_TIME=$(date +%F)
+
+echo "Building version ${VERSION_FROM_GIT}"
+
+echo "package cmd" > cmd/FLEcli_version.go
+echo " " >> cmd/FLEcli_version.go
+echo "//VersionString is the version that will be displayed with the -v switch" >> cmd/FLEcli_version.go
+echo "const VersionString = \"${VERSION_FROM_GIT} (${BUILD_TIME})\"" >> cmd/FLEcli_version.go