fix build

// `autogen:go.mod`

module go.wit.com/apps/control-panel-dns

go 1.22

toolchain go1.23.6

require (
	github.com/miekg/dns v1.1.63
	go.wit.com/dev/alexflint/arg v1.5.5
	go.wit.com/gui v0.22.26
	go.wit.com/lib/debugger v0.22.9
	go.wit.com/lib/gadgets v0.22.9
	go.wit.com/lib/gui/cloudflare v0.22.10
	go.wit.com/lib/gui/linuxstatus v0.22.13
	go.wit.com/lib/gui/logsettings v0.22.9
	go.wit.com/lib/gui/shell v0.22.26
	go.wit.com/log v0.22.16
)

require (
	github.com/Showmax/go-fqdn v1.0.0 // indirect
	github.com/go-cmd/cmd v1.4.3 // indirect
	go.wit.com/dev/alexflint/scalar v1.2.4 // indirect
	go.wit.com/lib/protobuf/guipb v0.0.2 // indirect
	go.wit.com/widget v1.1.29 // indirect
	golang.org/x/mod v0.18.0 // indirect
	golang.org/x/net v0.31.0 // indirect
	golang.org/x/sync v0.7.0 // indirect
	golang.org/x/sys v0.27.0 // indirect
	golang.org/x/tools v0.22.0 // indirect
	google.golang.org/protobuf v1.36.5 // indirect
)

// `autogen:go.sum`

github.com/Showmax/go-fqdn v1.0.0 h1:0rG5IbmVliNT5O19Mfuvna9LL7zlHyRfsSvBPZmF9tM=
github.com/Showmax/go-fqdn v1.0.0/go.mod h1:SfrFBzmDCtCGrnHhoDjuvFnKsWjEQX/Q9ARZvOrJAko=
github.com/go-cmd/cmd v1.4.3 h1:6y3G+3UqPerXvPcXvj+5QNPHT02BUw7p6PsqRxLNA7Y=
github.com/go-cmd/cmd v1.4.3/go.mod h1:u3hxg/ry+D5kwh8WvUkHLAMe2zQCaXd00t35WfQaOFk=
github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/miekg/dns v1.1.63 h1:8M5aAw6OMZfFXTT7K5V0Eu5YiiL8l7nUAkyN6C9YwaY=
github.com/miekg/dns v1.1.63/go.mod h1:6NGHfjhpmr5lt3XPLuyfDJi5AXbNIPM9PY6H6sF1Nfs=
go.wit.com/dev/alexflint/arg v1.5.5 h1:c4jgIb4OvHjnCMRNSjOa1sNLl6WDxV6tIkMVezR9hCk=
go.wit.com/dev/alexflint/arg v1.5.5/go.mod h1:nH3F6TJDaAUgnLkC0WgRN/H047YfN1TYKaWPYr6B8lo=
go.wit.com/dev/alexflint/scalar v1.2.4 h1:zmBeEkObwz1lcelwfGNYP2GS6SQ9e0tdv7JdHwMZEEk=
go.wit.com/dev/alexflint/scalar v1.2.4/go.mod h1:kCNO1Fo5LnnK6+qa+zYhP5fdgfC1C+vx1ti99Md+FAM=
go.wit.com/gui v0.22.26 h1:HtdV1kx6wHpCTyS67s2KdMCyX6teNXIQOk1NyX6o8bY=
go.wit.com/gui v0.22.26/go.mod h1:6OVZofoS43VNUiQWR0aJkXEcqpuIhERJQnxhdGrEsHo=
go.wit.com/lib/debugger v0.22.9 h1:78e8iTiziNTLBM3V5DuKBm5bKsQDZKyhUJQ7wyebUBQ=
go.wit.com/lib/debugger v0.22.9/go.mod h1:nTD7B2G6FkrS9AzSNp+JW0vjzTidrg86QobuVD1np3M=
go.wit.com/lib/gadgets v0.22.9 h1:NUrPSCWwFMzt5iXNkEIh9tTkWX6f/4jrCoWosmFmKD8=
go.wit.com/lib/gadgets v0.22.9/go.mod h1:Gf3TM674Nu73xKJzWqindIM43IXPzACB/+YH+NMrh+c=
go.wit.com/lib/gui/cloudflare v0.22.10 h1:sa9gpfCHxrbpngihiH9frFF3KJ0oaaM2kNpcfKGVu5U=
go.wit.com/lib/gui/cloudflare v0.22.10/go.mod h1:L6geM1up7vJg/y/fnBRF5CmOR0Ex6Sx9KkhoSLJ2rNI=
go.wit.com/lib/gui/linuxstatus v0.22.13 h1:cV9etojljJWjxa11HdSsA9GVagFmszjRgIYWT2eUcxw=
go.wit.com/lib/gui/linuxstatus v0.22.13/go.mod h1:uMnxb5r5nmX6YUXT5Tr3RPxkdmbVGc30eT2uqOBYKTk=
go.wit.com/lib/gui/logsettings v0.22.9 h1:yQM5Vb2iHboBt/M77K06zFJ1tQbCcdkeeUuLmIIN1iU=
go.wit.com/lib/gui/logsettings v0.22.9/go.mod h1:IMy6Sz8+PKaHcPxA0fk3J+c6426m0Wq3Bgw/ntfEa+I=
go.wit.com/lib/gui/shell v0.22.26 h1:F+7aadEujsTgyBEs5ptKGL6N72reDkGd/7b0Ju4HeTU=
go.wit.com/lib/gui/shell v0.22.26/go.mod h1:Km5o+DLU5up5jvTEum9wiTdsZZG/EUNERVzn2wJ6DBE=
go.wit.com/lib/protobuf/guipb v0.0.2 h1:ZR4cLy+XheRQEFLlissBmASJDqiLfHaAluF6wYbVuOo=
go.wit.com/lib/protobuf/guipb v0.0.2/go.mod h1:mZsirb7zRgsE2IGHuvHkG7j85hkrGZl3NAALOEkjowA=
go.wit.com/log v0.22.16 h1:E0Vd0Z2ILtfjhs7J/CQ4g13DK1jtQiYl6l5KOBGsZoA=
go.wit.com/log v0.22.16/go.mod h1:/c5Uj30sWRQ4B5ei2ElB6Q8Si/cK6v+KbxnH208KD84=
go.wit.com/widget v1.1.29 h1:rURM/N1hbrl0btGlBIUx0SCre9jj+hshvkBLMMa008I=
go.wit.com/widget v1.1.29/go.mod h1:wj7TpAr2gk7Poa+v8XQkH1aidnTdgAa/a8GxrMtcztw=
golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0=
golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA=
golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c=
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

// `autogen:`

Makefile

@@ -1,14 +1,28 @@
 .PHONY: debian
 
-run: build
-	reset
-	cp -f control-panel-dns ~/
-	sudo ./control-panel-dns
+VERSION = $(shell git describe --tags)
+BUILDTIME = $(shell date +%Y.%m.%d)
+
+all: build
+	./control-panel-dns
 
 build:
-	-mkdir -p resources/
-	-cp ~/go/src/go.wit.com/toolkits/*.so resources/
-	GO111MODULE="off" go build -v
+	GO111MODULE=off go build \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+verbose:
+	GO111MODULE=off go build -v -x \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+install:
+	GO111MODULE=off go install \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+# embed the toolkit plugins in the binary
+embed:
+	-rm resources/*.so
+	touch resources/blank.so
+	cp -a ~/go/src/go.wit.com/toolkits/*.so resources/
 
 goimports:
 	goimports -w *.go
@@ -41,9 +55,6 @@ nocui: reset build
 check-git-clean:
 	@git diff-index --quiet HEAD -- || (echo "Git repository is dirty, please commit your changes first"; exit 1)
 
-install:
-	go install -v go.wit.com/control-panel-dns@latest
-
 build-release:
 	reset
 	go get -v -u -x .
@@ -71,10 +82,6 @@ clean:
 	-rm -f resources/*.so
 	-rm *.deb
 
-debian:
-	cd debian && make
-	-wit mirrors
-
 netlink:
 	GO111MODULE="off" go get -v -u github.com/vishvananda/netlink
 

argv.go

@@ -10,12 +10,14 @@ import (
 	"go.wit.com/log"
 )
 
-var args struct {
+var argv args
+
+type args struct {
 	Daemon bool `arg:"--daemon" help:"run without a gui"`
 }
 
 func init() {
-	arg.MustParse(&args)
+	arg.MustParse(&argv)
 
 	if debugger.ArgDebug() {
 		log.Info("cmd line --debugger == true")
@@ -25,3 +27,7 @@ func init() {
 		}()
 	}
 }
+
+func (args) Version() string {
+	return "go-clone " + VERSION + "    Built on " + BUILDTIME
+}

main.go

@@ -17,6 +17,10 @@ import (
 	"go.wit.com/lib/gui/linuxstatus"
 )
 
+// sent via -ldflags
+var VERSION string
+var BUILDTIME string
+
 //go:embed resources/*
 var resToolkit embed.FS