lockbox

commit 306d51363179972b5cb533993cdfcc1e66b521a6
parent b22006ebaff2a301b90436174cf1fc64b2142e3b
Author: Sean Enck <sean@ttypty.com>
Date:   Sun, 25 Jul 2021 09:22:05 -0400

cleaning up version

Diffstat:
M
.gitignore
 | 
1
-
M
cmd/lb/main.go
 | 
6
+++++-
M
configure
 | 
5
+++--
D
version.sh
 | 
31
-------------------------------

4 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 bin/
 Makefile
-generated.go
diff --git a/cmd/lb/main.go b/cmd/lb/main.go
@@ -12,6 +12,10 @@ import (
 	"voidedtech.com/lockbox/internal"
 )
 
+var (
+	version = "development"
+)
+
 func getEntry(store string, args []string, idx int) string {
 	if len(args) != idx+1 {
 		internal.Die("invalid entry given", internal.NewLockboxError("specific entry required"))
@@ -86,7 +90,7 @@ func main() {
 			fmt.Println(f)
 		}
 	case "version":
-		fmt.Printf("version:\n  %s\n", internal.Version)
+		fmt.Printf("version: %s\n", version)
 	case "insert":
 		multi := false
 		idx := 2
diff --git a/configure b/configure
@@ -29,6 +29,8 @@ for i in "$@"; do
             shift
             ;;
         *)
+            echo "unknown option: $i"
+            exit 1
             ;;
     esac
 done
@@ -56,7 +58,7 @@ _generate() {
         binapps+=($BIN_PATH$app)
     done
     echo "# Autogenerated file
-FLAGS  := -trimpath -buildmode=pie -mod=readonly -modcacherw
+FLAGS  := -ldflags \"-X main.version=\$(shell git log -n 1 --format=%h)\" -trimpath -buildmode=pie -mod=readonly -modcacherw
 
 all: prep ${binapps[@]} test
 
@@ -65,7 +67,6 @@ test:
 
 prep:
     mkdir -p $BIN_PATH
-    ./version.sh $GENERATED ${BIN_PATH}generated.go
 
 clean:
     rm -rf $BIN_PATH
diff --git a/version.sh b/version.sh
@@ -1,31 +0,0 @@
-#!/bin/bash
-GEN=$1
-VERS=$2
-VERS_NAME="Version"
-_version_info() {
-    echo "// Version is the hash/version info for lb."
-    git log -n 1 --format=%h | sed 's/^/'$VERS_NAME' = "/g;s/$/"/g'
-}
-
-_version() {
-    echo "package internal
-
-const ("
-    _version_info | sed 's/^/\t/g'
-    echo ")"
-}
-
-_getvers() {
-    cat $1 | grep "$VERS_NAME =" | awk '{print $3}'
-}
-
-_version > $VERS
-if [ -e $GEN ]; then
-    OLDVERS=$(_getvers $GEN)
-    NEWVERS=$(_getvers $VERS)
-    if [[ "$NEWVERS" == "$OLDVERS" ]]; then
-        rm -f $VERS
-        exit 0
-    fi
-fi
-mv $VERS $GEN