Merge pull request #334 from teharrison/master

add version option
MG-RAST · Jul 24, 2017 · f7c9f99 · f7c9f99
2 parents c8e0a02 + b47a002
commit f7c9f99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/shock-server/conf/conf.go b/shock-server/conf/conf.go
@@ -17,6 +17,8 @@ type idxOpts struct {
 	sparse   bool
 }
 
+const VERSION string = "[% VERSION %]"
+
 var LOG_OUTPUTS = [3]string{"file", "console", "both"}
 
 var (
@@ -146,6 +148,10 @@ func Initialize() (err error) {
 		c_store.PrintHelp()
 		os.Exit(0)
 	}
+	if SHOW_VERSION {
+		fmt.Printf("Shock version: %s\n", VERSION)
+		os.Exit(0)
+	}
 
 	return
 }

diff --git a/shock-server/main.go b/shock-server/main.go
@@ -158,7 +158,7 @@ func mapRoutes() {
 			S: time.Now().Format(longDateForm),
 			T: "Shock",
 			U: host + "/",
-			V: "[% VERSION %]",
+			V: conf.VERSION,
 		}
 		return responder.WriteResponseObject(ctx, http.StatusOK, r)
 	})