Makefile

@@ -6,7 +6,7 @@ MY_GOFLAGS = -ldflags "-s -w"
 
 all: dev
 
-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: MY_GOFLAGS = -ldflags "-s -w -X main.version=$(shell git describe --tags)"
 dev: build
 
 build:

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(getVersion()), "Hilbish version")
+	util.SetFieldProtected(fakeMod, mod, "ver", rt.StringValue(version), "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")
@@ -174,14 +174,6 @@ Check out the {blue}{bold}guide{reset} command to get started.
 	util.Document(editorModule, "")
 	mod.Set(rt.StringValue("editor"), rt.TableValue(editorModule))
 
-	versionModule := rt.NewTable()
-	util.SetField(rtm, versionModule, "branch", rt.StringValue(gitBranch), "Git branch Hilbish was compiled from")
-	util.SetField(rtm, versionModule, "full", rt.StringValue(getVersion()), "Full version info, including release name")
-	util.SetField(rtm, versionModule, "commit", rt.StringValue(gitCommit), "Git commit Hilbish was compiled from")
-	util.SetField(rtm, versionModule, "release", rt.StringValue(releaseName), "Release name")
-	util.Document(versionModule, "Version info interface.")
-	mod.Set(rt.StringValue("version"), rt.TableValue(versionModule))
-
 	return rt.TableValue(fakeMod), nil
 }
 

main.go

@@ -106,7 +106,7 @@ func main() {
 	}
 
 	if *verflag {
-		fmt.Printf("Hilbish %s\n", getVersion())
+		fmt.Printf("Hilbish %s\n", version)
 		os.Exit(0)
 	}
 
@@ -303,20 +303,3 @@ 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)
-	}
-
-	v.WriteString(" (" + releaseName + ")")
-
-	return v.String()
-}

vars.go

@@ -2,6 +2,7 @@ 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'"
 
@@ -9,14 +10,6 @@ var (
 	multilinePrompt = "> "
 )
 
-// Version info
-var (
-	ver = "v2.0.0"
-	releaseName = "Hibiscus"
-	gitCommit string
-	gitBranch string
-)
-
 // Flags
 var (
 	running bool // Is a command currently running