From ac211093076ca24439913b166a1ee9912d67e776 Mon Sep 17 00:00:00 2001
From: TorchedSammy <38820196+TorchedSammy@users.noreply.github.com>
Date: Mon, 16 May 2022 19:36:34 -0400
Subject: [PATCH] fix: change how version is retrieved

---
 Makefile |  2 +-
 api.go   |  2 +-
 main.go  | 17 ++++++++++++++++-
 vars.go  |  9 ++++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index a0c6580..40945d3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ MY_GOFLAGS = -ldflags "-s -w"
 
 all: dev
 
-dev: MY_GOFLAGS = -ldflags "-s -w -X main.version=$(shell git describe --tags)"
+dev: MY_GOFLAGS = -ldflags "-s -w -X main.gitCommit=$(shell git rev-parse --short HEAD) -X main.gitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
 dev: build
 
 build:
diff --git a/api.go b/api.go
index dad3797..be0ed4d 100644
--- a/api.go
+++ b/api.go
@@ -107,7 +107,7 @@ func hilbishLoad(rtm *rt.Runtime) (rt.Value, func()) {
 The nice lil shell for {blue}Lua{reset} fanatics!
 Check out the {blue}{bold}guide{reset} command to get started.
 `
-	util.SetFieldProtected(fakeMod, mod, "ver", rt.StringValue(version), "Hilbish version")
+	util.SetFieldProtected(fakeMod, mod, "ver", rt.StringValue(getVersion()), "Hilbish version")
 	util.SetFieldProtected(fakeMod, mod, "user", rt.StringValue(username), "Username of user")
 	util.SetFieldProtected(fakeMod, mod, "host", rt.StringValue(host), "Host name of the machine")
 	util.SetFieldProtected(fakeMod, mod, "home", rt.StringValue(curuser.HomeDir), "Home directory of the user")
diff --git a/main.go b/main.go
index c0fce06..d9229e4 100644
--- a/main.go
+++ b/main.go
@@ -106,7 +106,7 @@ func main() {
 	}
 
 	if *verflag {
-		fmt.Printf("Hilbish %s\n", version)
+		fmt.Printf("Hilbish %s\n", getVersion())
 		os.Exit(0)
 	}
 
@@ -303,3 +303,18 @@ func exit(code int) {
 		}
 	}
 }
+
+func getVersion() string {
+	v := strings.Builder{}
+
+	v.WriteString(ver)
+	if gitBranch != "" && gitBranch != "HEAD" {
+		v.WriteString("-" + gitBranch)
+	}
+
+	if gitCommit != "" {
+		v.WriteString("." + gitCommit)
+	}
+
+	return v.String()
+}
diff --git a/vars.go b/vars.go
index 9238ffb..810c1ee 100644
--- a/vars.go
+++ b/vars.go
@@ -2,7 +2,6 @@ package main
 
 // String vars that are free to be changed at compile time
 var (
-	version = "v2.0.0"
 	defaultHistDir = ""
 	commonRequirePaths = "';./libs/?/init.lua;./?/init.lua;./?/?.lua'"
 
@@ -10,6 +9,14 @@ var (
 	multilinePrompt = "> "
 )
 
+// Version info
+var (
+	ver = "v2.0.0"
+	releaseName = "Hibiscus"
+	gitCommit string
+	gitBranch string
+)
+
 // Flags
 var (
 	running bool // Is a command currently running