cleanupsv0.0.67

1 files changed, 15 insertions, 13 deletions

diff --git a/main.go b/main.go
index f8a0fb1..143045f 100644
--- a/main.go
+++ b/main.go
@@ -4,12 +4,12 @@
 package main
 
 import (
-	"embed"
 	"os"
 	"time"
 
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
+	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/protobuf/zoopb"
 	"go.wit.com/log"
 )
@@ -17,17 +17,19 @@ import (
 var VERSION string
 var BUILDTIME string
 
-//go:embed resources/*
-var resources embed.FS
+var ARGNAME string = "zookeeper"
 
 func main() {
-	log.Warn("zookeeper PID:", os.Getpid(), os.Args)
-	var pp *arg.Parser
-	gui.InitArg()             // include the 'gui' package command line arguements
-	pp = arg.MustParse(&argv) // parse the command line
+	me = new(mainType)
+	gui.InitArg()
+	me.pp = arg.MustParse(&argv)
 
-	if pp == nil {
-		pp.WriteHelp(os.Stdout)
+	if argv.Bash {
+		fhelp.DoBash(ARGNAME)
+		os.Exit(0)
+	}
+	if len(argv.BashAuto) != 0 {
+		argv.doBashAuto()
 		os.Exit(0)
 	}
 
@@ -47,7 +49,6 @@ func main() {
 		log.DaemonMode(true)
 	}
 
-	me = new(zookeep)
 	me.hostname, _ = os.Hostname()
 	me.pollDelay = time.Hour
 	me.machines = zoopb.NewMachines()
@@ -55,9 +56,10 @@ func main() {
 		log.Warn("load config failed", err)
 		os.Exit(-1)
 	}
-	// me.upgrade = make(map[string]bool) // used to trigger upgrade attempts
-
-	// log.Sleep(3)
+	if argv.List != nil {
+		log.Info("do list here")
+		okExit("")
+	}
 
 	go NewWatchdog()
 	if !argv.NoPort {