From dee8c005fd3e255330a0680e0d357f4657e2b6e8 Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Sun, 24 Sep 2017 08:10:35 -0400
Subject: [PATCH] add git version to srnd version string

---
 contrib/backends/srndv2/Makefile            |  2 +-
 contrib/backends/srndv2/src/srnd/version.go | 10 ++++++----
 contrib/backends/srndv2/srnd.go             |  4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/contrib/backends/srndv2/Makefile b/contrib/backends/srndv2/Makefile
index 4c63dbf..a956562 100644
--- a/contrib/backends/srndv2/Makefile
+++ b/contrib/backends/srndv2/Makefile
@@ -11,7 +11,7 @@ assert-go:
 	test $(VERSION) = go1.9
 
 srndv2: assert-go
-	GOPATH=$(REPO) GOROOT=$(GOROOT) $(GO) build -v
+	GOPATH=$(REPO) GOROOT=$(GOROOT) $(GO) build -ldflags "-X srnd.GitVersion=-$(shell git rev-parse --short HEAD)" -v
 
 clean:
 	GOPATH=$(REPO) GOROOT=$(GOROOT) $(GO) clean -v
diff --git a/contrib/backends/srndv2/src/srnd/version.go b/contrib/backends/srndv2/src/srnd/version.go
index 8982063..b660e70 100644
--- a/contrib/backends/srndv2/src/srnd/version.go
+++ b/contrib/backends/srndv2/src/srnd/version.go
@@ -6,10 +6,12 @@ package srnd
 
 import "fmt"
 
-var major_version = 5
-var minor_version = 0
-var program_name = "srnd"
+const major_version = 5
+const minor_version = 0
+const program_name = "srnd"
+
+var GitVersion string
 
 func Version() string {
-	return fmt.Sprintf("%s version 2.%d.%d", program_name, major_version, minor_version)
+	return fmt.Sprintf("%s-2.%d.%d%s", program_name, major_version, minor_version, GitVersion)
 }
diff --git a/contrib/backends/srndv2/srnd.go b/contrib/backends/srndv2/srnd.go
index 705c5e4..6988ee1 100644
--- a/contrib/backends/srndv2/srnd.go
+++ b/contrib/backends/srndv2/srnd.go
@@ -140,10 +140,12 @@ func main() {
 			} else {
 				fmt.Fprintf(os.Stdout, "Usage: %s tool [rethumb|keygen|nntp|mod|expire]\n", os.Args[0])
 			}
+		} else if action == "version" {
+			fmt.Println(srnd.Version())
 		} else {
 			log.Println("Invalid action:", action)
 		}
 	} else {
-		fmt.Fprintf(os.Stdout, "Usage: %s [setup|run|tool]\n", os.Args[0])
+		fmt.Fprintf(os.Stdout, "Usage: %s [setup|run|tool|version]\n", os.Args[0])
 	}
 }