summary refs log tree commit diff stats
path: root/svc
diff options
context:
space:
mode:
authorBen Morrison <ben@gbmor.dev>2019-06-09 23:14:56 -0400
committerBen Morrison <ben@gbmor.dev>2019-06-09 23:26:30 -0400
commit45d67236e16365e0c6ea90e9b8baa3008d50996d (patch)
tree4639f792e06633280dfe250fd2eba796b8cb6089 /svc
parent3b6d1cc9f8acf82be9f168657b6ecab1eb34721e (diff)
downloadgetwtxt-45d67236e16365e0c6ea90e9b8baa3008d50996d.tar.gz
setting version via build flags
Diffstat (limited to 'svc')
-rw-r--r--svc/conf.go4
-rw-r--r--svc/help.go2
-rw-r--r--svc/init.go4
-rw-r--r--svc/init_test.go5
-rw-r--r--svc/svc.go2
5 files changed, 8 insertions, 9 deletions
diff --git a/svc/conf.go b/svc/conf.go
index 5f4233b..d85bbee 100644
--- a/svc/conf.go
+++ b/svc/conf.go
@@ -157,9 +157,9 @@ func initConfig() {
 
 	confObj.LastCache = time.Now()
 	confObj.LastPush = time.Now()
-	confObj.Version = getwtxt
+	confObj.Version = Vers
 
-	confObj.Instance.Vers = getwtxt
+	confObj.Instance.Vers = Vers
 	confObj.Instance.Name = viper.GetString("Instance.SiteName")
 	confObj.Instance.URL = viper.GetString("Instance.URL")
 	confObj.Instance.Owner = viper.GetString("Instance.OwnerName")
diff --git a/svc/help.go b/svc/help.go
index 9566f93..09faadb 100644
--- a/svc/help.go
+++ b/svc/help.go
@@ -11,7 +11,7 @@ func titleScreen() {
            | (_| |  __/ |_ \ V  V /| |_ >  <| |_
             \__, |\___|\__| \_/\_/  \__/_/\_\\__|
             |___/
-                       version ` + getwtxt + `
+                       version ` + Vers + `
                  github.com/getwtxt/getwtxt
                           GPL  v3  
 
diff --git a/svc/init.go b/svc/init.go
index e9c64af..6af7866 100644
--- a/svc/init.go
+++ b/svc/init.go
@@ -12,9 +12,9 @@ import (
 	"github.com/spf13/pflag"
 )
 
-const getwtxt = "0.3.0"
-
 var (
+	// Vers contains the version number set at build time
+	Vers         string
 	flagVersion  *bool   = pflag.BoolP("version", "v", false, "Display version information, then exit.")
 	flagHelp     *bool   = pflag.BoolP("help", "h", false, "Display the quick-help screen.")
 	flagMan      *bool   = pflag.BoolP("manual", "m", false, "Display the configuration manual.")
diff --git a/svc/init_test.go b/svc/init_test.go
index 385db0e..b2fcd9a 100644
--- a/svc/init_test.go
+++ b/svc/init_test.go
@@ -82,9 +82,9 @@ func testConfig() {
 
 	confObj.LastCache = time.Now()
 	confObj.LastPush = time.Now()
-	confObj.Version = getwtxt
+	confObj.Version = Vers
 
-	confObj.Instance.Vers = getwtxt
+	confObj.Instance.Vers = Vers
 	confObj.Instance.Name = viper.GetString("Instance.SiteName")
 	confObj.Instance.URL = viper.GetString("Instance.URL")
 	confObj.Instance.Owner = viper.GetString("Instance.OwnerName")
@@ -93,7 +93,6 @@ func testConfig() {
 }
 
 func mockRegistry() {
-
 	statuses, _, _ := registry.GetTwtxt("https://gbmor.dev/twtxt.txt")
 	parsed, _ := registry.ParseUserTwtxt(statuses, "gbmor", "https://gbmor.dev/twtxt.txt")
 	_ = twtxtCache.AddUser("gbmor", "https://gbmor.dev/twtxt.txt", "1", net.ParseIP("127.0.0.1"), parsed)
diff --git a/svc/svc.go b/svc/svc.go
index ae5f7e9..4d781eb 100644
--- a/svc/svc.go
+++ b/svc/svc.go
@@ -112,7 +112,7 @@ func Start() {
 	}
 
 	log.Printf("\nListening on %v\n", portnum)
-	log.Printf("\n:: getwtxt %v Started :: %v ::\n\n", getwtxt, time.Now().Format(time.RFC3339))
+	log.Printf("\n:: getwtxt %v Started :: %v ::\n\n", Vers, time.Now().Format(time.RFC3339))
 	errLog("", server.ListenAndServe())
 
 	closeLog <- true