Fix build/version string handling.

- Split build and version strings.
- Display version instead of build on the admin UI via the config API.

Makefile

@@ -1,6 +1,6 @@
 LAST_COMMIT := $(shell git rev-parse --short HEAD)
 VERSION := $(shell git describe --tags --abbrev=0)
-BUILDSTR := ${VERSION} (\#${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z"))
+BUILDSTR := \#${LAST_COMMIT} $(shell date -u +"%Y-%m-%dT%H:%M:%S%z")
 
 STATIC := config.sample.toml schema.sql queries.sql admin
 BIN := dictpress
@@ -12,7 +12,7 @@ deps:
 
 .PHONY: build
 build:
-	go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}'" cmd/${BIN}/*.go
+	go build -o ${BIN} -ldflags="-s -w -X 'main.buildString=${BUILDSTR}' -X 'main.versionString=${VERSION}'" cmd/${BIN}/*.go
 
 .PHONY: run
 run:

admin/base.html

@@ -51,7 +51,9 @@
 	</div>
 </template>
 <footer class="footer">
-	<a href="https://dict.press">DictPress <span x-text="config.version"></span></a>
+	<a href="https://dict.press">
+		DictPress <span x-text="config.version"></span>
+	</a>
 </footer>
 </body>
 </html>

cmd/dictpress/admin_handlers.go

@@ -23,7 +23,8 @@ func handleGetConfig(c echo.Context) error {
 		RootURL   string       `json:"root_url"`
 		Languages data.LangMap `json:"languages"`
 		Version   string       `json:"version"`
-	}{app.constants.RootURL, app.data.Langs, buildString}
+		BuildStr  string       `json:"build"`
+	}{app.constants.RootURL, app.data.Langs, versionString, buildString}
 
 	return c.JSON(http.StatusOK, okResp{out})
 }

cmd/dictpress/main.go

@@ -20,7 +20,8 @@ import (
 )
 
 var (
-	buildString = "unknown"
+	buildString   = "unknown"
+	versionString = "unknown"
 )
 
 // Lang represents a language's configuration.
@@ -80,7 +81,7 @@ func init() {
 	}
 
 	if ok, _ := f.GetBool("version"); ok {
-		fmt.Println(buildString)
+		fmt.Printf("%s (%s)\n", versionString, buildString)
 		os.Exit(0)
 	}