builds again

8 files changed, 39 insertions, 38 deletions

diff --git a/argv.template.go b/argv.template.go
index 681be3b..801f9e6 100644
--- a/argv.template.go
+++ b/argv.template.go
@@ -6,8 +6,6 @@ package main
 // TODO: clean this up in argv
 
 import (
-	"os"
-
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
 	"go.wit.com/lib/env"
@@ -20,11 +18,11 @@ func (args) InitArgv() (string, string, string) {
 }
 
 // this function will send the current argv PB to go-args for parsing
-func (args) ParseFlags(flags []string) error {
+func (args) ParseFlags() error {
 	var err error
 	if me.pp == nil {
 		// log.Info("Parse Flags GOT flags:", flags)
-		me.pp, err = arg.ParseFlags(flags, &argv)
+		me.pp, err = arg.ParseFlagsArgv(&argv)
 		// panic("got to the app's ParseFlags()")
 	} else {
 		panic("me.pp was not nil")
@@ -33,24 +31,23 @@ func (args) ParseFlags(flags []string) error {
 }
 
 // add this funcgion: this will print the help
-func (args) WriteHelpForSubcommand(cmd string) error {
-	me.pp.WriteHelpForSubcommand(os.Stderr, cmd)
+func (args) WriteHelpForSubcommand() error {
+	me.pp.WriteHelpForSubcommandArgv()
 	return nil
 }
 
 // this will print the help for the subcmd
-func (args) WriteHelpForAutocomplete(part string, subcmd ...string) error {
-	return me.pp.WriteHelpForAutocomplete(os.Stderr, os.Stdout, part, subcmd...)
+func (args) WriteHelpForAutocomplete() error {
+	return me.pp.WriteHelpForAutocompleteArgv()
 }
 
-func (args) WriteHelpForAutocompleteDebug(part string, subcmd ...string) error {
-	f, _ := os.OpenFile("/tmp/argv.junk", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	return me.pp.WriteHelpForAutocomplete(f, os.Stdout, part, subcmd...)
+func (args) WriteHelpForAutocompleteDebug() error {
+	return me.pp.WriteHelpForAutocompleteArgv()
 }
 
 // add this funcgion: this will print the help
 func (args) WriteHelp() error {
-	me.pp.WriteHelp(os.Stderr)
+	me.pp.WriteHelpArgv()
 	return nil
 }
 
diff --git a/doFix.deleteuser.go b/doFix.deleteuser.go
index 43a6563..f9878d4 100644
--- a/doFix.deleteuser.go
+++ b/doFix.deleteuser.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"strings"
 
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/forgepb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -167,7 +168,7 @@ func doFixDeleteUserLocalBranch(repo *gitpb.Repo, remoteRef *gitpb.GitTag, local
 			if err != nil {
 				log.Info(localUser.GetRefname(), repo.FullPath)
 				s := "local user branch could not be deleted"
-				me.argv.BadExit(s, err)
+				argvpb.BadExit(s, err)
 			}
 			return nil, notes
 		}
@@ -198,7 +199,7 @@ func doFixDeleteUserLocalBranch(repo *gitpb.Repo, remoteRef *gitpb.GitTag, local
 			if err != nil {
 				log.Info(localUser.GetRefname(), repo.FullPath)
 				s := "local user branch could not be deleted"
-				me.argv.BadExit(s, err)
+				argvpb.BadExit(s, err)
 			}
 		}
 		return ErrorNeedArgvFix, notes
@@ -240,7 +241,7 @@ func doFixDeleteRemoteUserBranch(repo *gitpb.Repo, remoteRef *gitpb.GitTag) (err
 			if err != nil {
 				log.Info(remoteUser.GetRefname(), repo.FullPath)
 				s := "remote user branch could not be deleted"
-				me.argv.BadExit(s, err)
+				argvpb.BadExit(s, err)
 			}
 		}
 		return ErrorNeedArgvFix, notes
@@ -282,7 +283,7 @@ func doFixDeleteLocalUserByDevel(repo *gitpb.Repo, localRef *gitpb.GitTag) (erro
 			if err != nil {
 				log.Info(localUser.GetRefname(), repo.FullPath)
 				s := "local user branch could not be deleted"
-				me.argv.BadExit(s, err)
+				argvpb.BadExit(s, err)
 			}
 		}
 		return ErrorNeedArgvFix, notes
@@ -327,7 +328,7 @@ func doFixDeleteLocalUserByMaster(repo *gitpb.Repo, localRef *gitpb.GitTag) (err
 			if err != nil {
 				log.Info(localUser.GetRefname(), repo.FullPath)
 				s := "local user branch could not be deleted"
-				me.argv.BadExit(s, err)
+				argvpb.BadExit(s, err)
 			}
 		}
 		return ErrorNeedArgvFix, notes
diff --git a/doRebuild.go b/doRebuild.go
index febbedc..5aaa9d0 100644
--- a/doRebuild.go
+++ b/doRebuild.go
@@ -12,6 +12,7 @@ import (
 
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gui/shell"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
@@ -151,7 +152,7 @@ func doRebuildPart2() (string, error) {
 	log.Info("Running:", cmd)
 	r = shell.RunRealtime(cmd)
 	if r.Error != nil {
-		me.argv.BadExit("download forge failed", r.Error)
+		argvpb.BadExit("download forge failed", r.Error)
 	}
 	doVerifyNamespace()
 
@@ -159,7 +160,7 @@ func doRebuildPart2() (string, error) {
 	log.Info("Running:", cmd)
 	r = shell.RunRealtime(cmd)
 	if r.Error != nil {
-		me.argv.BadExit("download CUI GO plugin toolkit failed", r.Error)
+		argvpb.BadExit("download CUI GO plugin toolkit failed", r.Error)
 	}
 	doVerifyNamespace()
 
@@ -167,7 +168,7 @@ func doRebuildPart2() (string, error) {
 	log.Info("Running:", cmd)
 	r = shell.RunRealtime(cmd)
 	if r.Error != nil {
-		me.argv.BadExit("download GTK GO plugin toolkit failed", r.Error)
+		argvpb.BadExit("download GTK GO plugin toolkit failed", r.Error)
 	}
 	_, err := doVerifyNamespace()
 	_, err = doVerifyNamespace()
diff --git a/doStats.go b/doStats.go
index 8bc16cb..05f6c50 100644
--- a/doStats.go
+++ b/doStats.go
@@ -9,6 +9,7 @@ import (
 
 	"go.wit.com/lib/cobol"
 	"go.wit.com/lib/env"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -233,7 +234,7 @@ func safeDelete(r *gitpb.Repo, deleteHash string, keepHash string) error {
 			if err != nil {
 				log.Info(deleteHash, r.FullPath)
 				s := "local user branch could not be deleted"
-				me.argv.BadExit(s, err)
+				argvpb.BadExit(s, err)
 			}
 		}
 		return ErrorNeedArgvFix
diff --git a/exit.go b/exit.go
index 4f21c7c..2ecd1e8 100644
--- a/exit.go
+++ b/exit.go
@@ -5,6 +5,7 @@ package main
 
 import (
 	"go.wit.com/lib/env"
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
@@ -24,18 +25,18 @@ func forgeExit() {
 }
 
 func okExit(thing string) {
-	me.argv.GoodExit(thing)
+	argvpb.GoodExit(thing)
 }
 
 func badExit(err error) {
-	me.argv.BadExit("forge failed", err)
+	argvpb.BadExit("forge failed", err)
 }
 
 func newBadExit(msg string, err error) {
-	me.argv.BadExit(msg, err)
+	argvpb.BadExit(msg, err)
 }
 
 func badRepoExit(repo *gitpb.Repo, err error) {
 	s := log.Sprintf("%s FAILED: %v", repo.GetNamespace(), err)
-	me.argv.BadExit(s, err)
+	argvpb.BadExit(s, err)
 }
diff --git a/ipv6test.go b/ipv6test.go
index 45ff985..c6befb0 100644
--- a/ipv6test.go
+++ b/ipv6test.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"time"
 
+	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/log"
 )
 
@@ -22,7 +23,7 @@ func ipv6fails() bool {
 		log.Info(s)
 		WarningForIpv4()
 		s = "THIS FEATURE IS NOT SUPPORTED ON IPv4"
-		me.argv.BadExit(s, nil)
+		argvpb.BadExit(s, nil)
 	}
 	if len(addrs) == 0 {
 		log.Info("wierd. probably ipv6 dns problems")
@@ -34,7 +35,7 @@ func ipv6fails() bool {
 			log.Info(s)
 			WarningForIpv4()
 			s = "THIS FEATURE IS NOT SUPPORTED ON IPv4"
-			me.argv.BadExit(s, nil)
+			argvpb.BadExit(s, nil)
 		}
 	*/
 
@@ -44,7 +45,7 @@ func ipv6fails() bool {
 		log.Info(s)
 		WarningForIpv4()
 		s = "THIS FEATURE IS NOT SUPPORTED ON IPv4"
-		me.argv.BadExit(s, nil)
+		argvpb.BadExit(s, nil)
 	}
 	return true
 }
diff --git a/main.go b/main.go
index 1d59034..d946cb2 100644
--- a/main.go
+++ b/main.go
@@ -44,11 +44,11 @@ func main() {
 	var s string
 	var err error
 	me = new(mainType)
-	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
+	argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
 	me.forge, err = forgepb.Init()
 	if err != nil {
 		log.Printf("forge failure on Init err=(%v)\n", err)
-		me.argv.BadExit("WTF", err)
+		argvpb.BadExit("WTF", err)
 	}
 	if env.Verbose() {
 		env.PrintTable()
@@ -61,17 +61,17 @@ func main() {
 	// put things to do every time forge runs here
 	doCoreChecks()
 
-	if me.argv.GetCmd() == "" {
+	if argvpb.GetCmd() == "" {
 		// no command line arguments were given
 		// do the default behavior and exit
 		s, err := doDefaultBehavior()
 		if err != nil {
-			me.argv.BadExit(s, err)
+			argvpb.BadExit(s, err)
 		}
-		me.argv.GoodExit(s)
+		argvpb.GoodExit(s)
 	}
 
-	log.Info("Starting forge with subcommand:", me.argv.GetCmd())
+	log.Info("Starting forge with subcommand:", argvpb.GetCmd())
 	s, err = doSubcommand()
 
 	// if the gui starts, it doesn't yet go to the end normally
@@ -82,7 +82,7 @@ func main() {
 	}
 	// safe exits back to your shell (with timing and toolkit close)
 	if err != nil {
-		me.argv.BadExit(s, err)
+		argvpb.BadExit(s, err)
 	}
-	me.argv.GoodExit(s)
+	argvpb.GoodExit(s)
 }
diff --git a/structs.go b/structs.go
index 39840c3..7ea423c 100644
--- a/structs.go
+++ b/structs.go
@@ -9,7 +9,6 @@ import (
 	"go.wit.com/lib/env"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/protobuf/argvpb"
 	"go.wit.com/lib/protobuf/forgepb"
 )
 
@@ -32,7 +31,7 @@ func myServer() string {
 
 // this app's variables
 type mainType struct {
-	argv       *argvpb.Argv     // shell autocomplete
+	// argv       *argvpb.Argv     // shell autocomplete
 	pp         *arg.Parser      // the go-arg parser of the command line
 	forge      *forgepb.Forge   // for holding the forge protobuf files
 	myGui      *fhelp.GuiPrep   // for initializing the GUI toolkits