better notes

Signed-off-by: Jeff Carr <[email protected]>

4 files changed, 21 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index 75e911c..c8ea397 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,13 @@
+.PHONY: build
+
 VERSION = $(shell git describe --tags)
 
 all:
-	@echo "make run       # will build and run the daemon here"
+	@echo "make build     # build"
+	@echo "make clean     # clean build files"
+	@echo "make run       # build and run on port 2233"
 	@echo "make debian    # will build a debian package"
+	@echo ""
 	@echo "make restart   # restart the daemon"
 	@echo "make enable    # enable daemon on boot"
 	@echo "make log       # watch the daemon log"
@@ -18,10 +23,18 @@ restart:
 	systemctl stop gowebd.service
 	systemctl start gowebd.service
 
-run:
-	git pull
+start:
+	systemctl start gowebd.service
+
+stop:
+	systemctl stop gowebd.service
+
+build:
 	echo "build it!"
-	GO111MODULE=off go build -v -x -ldflags "-X main.Version=${VERSION} -X gui.GUIVERSION=${VERSION}"
+	# 2024/11/06 14:41:29 path = /home/jcarr/go/src/go.wit.com/apps/gowebd cmd = go build -v -x -ldflags -X main.VERSION=0.22.2-3-g28e0f09-dirty -ldflags -X main.GUIVERSION=0.22.2-3-g28e0f09-dirty
+	GO111MODULE=off go build -v -x -ldflags "-X main.VERSION=${VERSION} -X gui.GUIVERSION=${VERSION}"
+
+run: build
 	./gowebd --port 2233
 	# setcap 'cap_net_bind_service=+ep' gowebd   # allow the binary to open ports below 1024
 
diff --git a/args.go b/args.go
index 8d56458..0963462 100644
--- a/args.go
+++ b/args.go
@@ -18,7 +18,7 @@ type args struct {
 }
 
 func (args) Version() string {
-	return "gowebd " + Version
+	return "gowebd " + VERSION
 }
 
 func init() {
diff --git a/main.go b/main.go
index 6f6dbe2..88f7271 100644
--- a/main.go
+++ b/main.go
@@ -11,7 +11,9 @@ import (
 	"go.wit.com/log"
 )
 
-var Version string
+// are sent via -ldflags at buildtime
+var VERSION string
+var GUIVERSION string
 
 //go:embed resources/*
 var resources embed.FS
diff --git a/postinst b/postinst
index 2fb34e2..82b9e71 100755
--- a/postinst
+++ b/postinst
@@ -2,7 +2,6 @@
 set -e
 
 cd /etc/gowebd/
-ln -s /usr/share/gowebd/go.wit.com .
 
 # allow the binary to open ports below 1024
 setcap 'cap_net_bind_service=+ep' /usr/bin/gowebd