From 2fb38f90b23f4013e9079adfe2e630abc6dea17c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 Oct 2025 10:47:13 -0500 Subject: fixed --- Makefile | 2 +- argv.go | 13 +++++++++++++ argv.struct.go | 21 --------------------- main.go | 4 +++- 4 files changed, 17 insertions(+), 23 deletions(-) create mode 100644 argv.go delete mode 100644 argv.struct.go diff --git a/Makefile b/Makefile index 710703c..3cadaf3 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ VERSION = $(shell git describe --tags) BUILDTIME = $(shell date +%Y.%m.%d) -all: build +all: goimports build ./powerpaneld --hostname=breen # su -c "setcap 'cap_net_bind_service=+ep' go.wit.com" diff --git a/argv.go b/argv.go new file mode 100644 index 0000000..647489b --- /dev/null +++ b/argv.go @@ -0,0 +1,13 @@ +package main + +/* + this parses the command line arguements + + this enables command line options from other packages like 'gui' and 'log' +*/ + +var args struct { + ListRepos bool `arg:"--list-repos" help:"list all repositories"` + Port int `arg:"--port" help:"port to run on (default is 2520)"` + Hostname string `arg:"--hostname" help:"hostname to use"` +} diff --git a/argv.struct.go b/argv.struct.go deleted file mode 100644 index 1bc121c..0000000 --- a/argv.struct.go +++ /dev/null @@ -1,21 +0,0 @@ -package main - -/* - this parses the command line arguements - - this enables command line options from other packages like 'gui' and 'log' -*/ - -import ( - "go.wit.com/dev/alexflint/arg" -) - -var args struct { - ListRepos bool `arg:"--list-repos" help:"list all repositories"` - Port int `arg:"--port" help:"port to run on (default is 2520)"` - Hostname string `arg:"--hostname" help:"hostname to use"` -} - -func init() { - arg.MustParse(&args) -} diff --git a/main.go b/main.go index 111b76f..4ed3127 100644 --- a/main.go +++ b/main.go @@ -6,8 +6,9 @@ import ( "strings" "time" - "go.wit.com/log" + "github.com/alexflint/go-arg" "go.wit.com/lib/gui/shell" + "go.wit.com/log" ) // var accessf, clientf *os.File @@ -54,6 +55,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) { } func main() { + arg.MustParse(&args) var hostname string = args.Hostname if hostname == "" { -- cgit v1.2.3