cleanup

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

1 files changed, 24 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index 88312b5..63d19dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,48 +1,48 @@
 .PHONY: debian
 
 run: build
-	# ./control-panel-dns >/tmp/witgui.log.stderr 2>&1
 	cp -f control-panel-dns ~/
-	# ./control-panel-dns --tmp-log
 	./control-panel-dns
 
+build:
+	-mkdir -p resources/
+	-cp ~/go/src/go.wit.com/toolkits/*.so resources/
+	GO111MODULE="off" go build -v
+
+goimports:
+	goimports -w *.go
+
+redomod:
+	rm -f go.*
+	GO111MODULE= go mod init
+	GO111MODULE= go mod tidy
+
 stderr: build
 	./control-panel-dns >/tmp/witgui.log.stderr 2>&1
 
+log:
+	reset
+	tail -f /tmp/witgui.* /tmp/guilogfile
+
 gocui: build
 	reset
-	# ./gadgetwindow --gui gocui >/tmp/gadgetwindow.stderr 2>&1
 	./control-panel-dns --gui gocui --tmp-log
 
-goimports:
-	goimports -w *.go
-
 check-git-clean:
 	@git diff-index --quiet HEAD -- || (echo "Git repository is dirty, please commit your changes first"; exit 1)
 
-redomod:
-	rm -f go.*
-	GO111MODULE= go mod init
-	GO111MODULE= go mod tidy
-
 install:
 	go install -v go.wit.com/control-panel-dns@latest
-	# go install -v go.wit.com/control-panel-dns@latest
 
 build-release:
 	reset
 	go get -v -u -x .
 	go build
 
-# This will update all your git repos to HEAD
+# This will git pull all the git repo dependencies
 goGetUpdate:
 	GO111MODULE="off" go get -v -u .
 
-build:
-	-mkdir -p resources/
-	-cp ~/go/src/go.wit.com/toolkits/*.so resources/
-	GO111MODULE="off" go build -v
-
 # ./control-panel-dns.v1: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.34' not found (required by ./control-panel-dns.v1)
 # ./control-panel-dns.v1: /lib/x86_64-linux-gnu/libc.so.6: version `GLIBC_2.32' not found (required by ./control-panel-dns.v1)
 # compiling with CGO disabled means it compiles but then plugins don't load
@@ -72,22 +72,19 @@ netlink:
 ####### MODULE STUFF DOWN HERE
 #
 #       What again is the 'right' way to do this?
-#       It seems like it changes from year to year. This is better than 'vendor/' (that was a terrible hack)
-#       maybe it's settled down finally. Use GO111MODULE="off" when you are developing. (?)
-#       When you are ready to release, version this and all the packages correctly. (?)
+#       maybe it's settled down finally. Use GO111MODULE="off" when you are developing.
+#       When you are ready to release, version this and all the packages correctly.
 #
-#       At least, that is what I'm going to try to do as of Feb 18 2023.
+#       At least, that is what I'm going to try to do as of Feb 1 2024.
 #
 
 
 build-with-custom-go.mod:
 	go build -modfile=local.go.mod ./...
 
-# module <yourname>
-# go 1.18
-# require (
-#     github.com/versent/saml2aws/v2 v2.35.0
-# )
+
+# notes on certs. move this somewhere else
+
 # replace github.com/versent/saml2aws/v2 v2.35.0 => github.com/marcottedan/saml2aws/v2 master
 # replace github.com/versent/saml2aws/v2 => /Users/dmarcotte/git/saml2aws/
 #
@@ -111,21 +108,3 @@ ssl-cert-hash:
 
 sudo-cp:
 	sudo cp -a lets-encrypt-r3.pem 8d33f237.0 /etc/ssl/certs/
-
-go-get:
-	go install -v go.wit.com/gui
-
-log:
-	reset
-	tail -f /tmp/witgui.* /tmp/guilogfile
-
-# sync repo to the github backup
-github:
-	-git remote add github [email protected]:wit-go/control-panel-dns.git
-	-git branch -M main
-	git push origin main
-	git push origin devel
-	git push origin --tags
-	git push github main
-	git push github devel
-	git push github --tags