summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--argv.go (renamed from argv.struct.go)8
-rw-r--r--main.go4
3 files changed, 4 insertions, 10 deletions
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.struct.go b/argv.go
index 1bc121c..647489b 100644
--- a/argv.struct.go
+++ b/argv.go
@@ -6,16 +6,8 @@ package main
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 == "" {