From 26cf2f20259a89fbba686d259b82d554ac24ec84 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 17 Oct 2025 05:32:48 -0500 Subject: try out argv as the name. is this weird? --- argv.go | 2 +- doBuild.debian.go | 4 ++-- doBuild.go | 10 +++++----- doClone.go | 2 +- doGit.go | 4 ++-- doPublish.go | 12 ++++++------ doUpgrade.go | 4 ++-- exit.go | 6 +++--- main.go | 30 +++++++++++++++--------------- structs.go | 4 ++-- upgrade.go | 2 +- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/argv.go b/argv.go index a1e578e..81d8431 100644 --- a/argv.go +++ b/argv.go @@ -176,7 +176,7 @@ func (a args) DoAutoComplete(pb *argvpb.Argv) { base = append(base, "rdate") } if pb.Cmd == "" { - pb.Autocomplete3(base) + pb.SendStrings(base) } else { pb.SubCommand(pb.Goargs...) } diff --git a/doBuild.debian.go b/doBuild.debian.go index 563423f..1694466 100644 --- a/doBuild.debian.go +++ b/doBuild.debian.go @@ -104,11 +104,11 @@ func doBuildDeb(all *gitpb.Repos) (string, error) { } if _, err := shell.RunVerbose([]string{"ls", "-l", "/home/jcarr/incoming"}); err != nil { - me.sh.BadExit("aptly failed", nil) + me.argv.BadExit("aptly failed", nil) } if _, err := fhelp.RunRealtimeError([]string{"do-aptly"}); err != nil { - me.sh.BadExit("aptly failed", nil) + me.argv.BadExit("aptly failed", nil) } return "all .deb built ok", nil } diff --git a/doBuild.go b/doBuild.go index 0a920d8..a9101e6 100644 --- a/doBuild.go +++ b/doBuild.go @@ -19,12 +19,12 @@ func doBuild() (string, error) { if argv.Build.Install != nil { if err := doInstall(me.forge.Repos); err != nil { // log.Info("doInstall() failed", err) - me.sh.BadExit("doInstall() failed", err) + me.argv.BadExit("doInstall() failed", err) } if argv.DryRun { - me.sh.GoodExit("Nothing built --dry-run") + me.argv.GoodExit("Nothing built --dry-run") } - me.sh.GoodExit("EVERYTHING BUILT!") + me.argv.GoodExit("EVERYTHING BUILT!") } if argv.Build.MacBuild != nil { @@ -37,7 +37,7 @@ func doBuild() (string, error) { if err := doInstall(found); err != nil { // log.Info("doInstall() failed", err) - me.sh.BadExit("doInstall() failed", err) + me.argv.BadExit("doInstall() failed", err) } return doBuildDeb(found) } @@ -88,7 +88,7 @@ func doInstall(all *gitpb.Repos) error { os.Remove(filepath.Join(me.homedir, "go/bin/forged")) if failed.Len() > 0 { footer := me.forge.PrintForgedTable(failed) - me.sh.BadExit("go install Failed for: "+footer, nil) + me.argv.BadExit("go install Failed for: "+footer, nil) } return nil } diff --git a/doClone.go b/doClone.go index 4f0777d..d2e5ffc 100644 --- a/doClone.go +++ b/doClone.go @@ -82,7 +82,7 @@ func doClone() error { if _, err := fhelp.RunRealtimeError(cmd); err != nil { if !argv.Force { msg := fmt.Sprintf("failed: %v", cmd) - me.sh.BadExit(msg, err) + me.argv.BadExit(msg, err) } } } diff --git a/doGit.go b/doGit.go index 290c4c6..1bd2cd6 100644 --- a/doGit.go +++ b/doGit.go @@ -90,7 +90,7 @@ func doGit() (string, error) { } else { log.Info("not installing") } - me.sh.GoodExit("git who should be installed") + me.argv.GoodExit("git who should be installed") } cmd := []string{"git", "who", "-l", "."} shell.RunVerbose(cmd) @@ -186,7 +186,7 @@ func doPush(wpath string) { if err := repo.GitCommit(); err != nil { msg := fmt.Sprintf("repo.GitCommit() %s", repo.FullPath) - me.sh.BadExit(msg, err) + me.argv.BadExit(msg, err) } repo.RunRealtime([]string{"git", "push"}) diff --git a/doPublish.go b/doPublish.go index 08fcec3..a9e5be5 100644 --- a/doPublish.go +++ b/doPublish.go @@ -26,7 +26,7 @@ func doPublish() error { log.Info("$ENV[GUIRELEASE_REASON] was not set") reason := fhelp.InputFromUser("set tag message:") if reason == "" { - me.sh.BadExit("merge failed", fmt.Errorf("GUIRELEASE_REASON was blank")) + me.argv.BadExit("merge failed", fmt.Errorf("GUIRELEASE_REASON was blank")) } os.Setenv("GUIRELEASE_REASON", reason) } @@ -35,13 +35,13 @@ func doPublish() error { cmd = []string{"forge", "merge", "--all"} if _, err := shell.RunRealtimeError(cmd); err != nil { - me.sh.BadExit("merge failed", nil) + me.argv.BadExit("merge failed", nil) } cmd = []string{"forge", "merge", "check"} if _, err := shell.RunRealtimeError(cmd); err != nil { if _, err := shell.RunVerbose(cmd); err != nil { - me.sh.BadExit("merge failed", nil) + me.argv.BadExit("merge failed", nil) } } // todo: os.Stat() file @@ -50,7 +50,7 @@ func doPublish() error { if err := doInstall(me.forge.Repos); err != nil { log.Info("doInstall() failed", err) - me.sh.BadExit("merge failed", nil) + me.argv.BadExit("merge failed", nil) } if os.Getenv("GUIRELEASE_REASON") == "" { @@ -71,9 +71,9 @@ func doPublish() error { } if _, err := shell.RunRealtimeError(cmd); err != nil { log.Info("releaser failed", err) - me.sh.BadExit("publishing failed", nil) + me.argv.BadExit("publishing failed", nil) } - me.sh.GoodExit("PUBLISH WORKED") + me.argv.GoodExit("PUBLISH WORKED") return nil } diff --git a/doUpgrade.go b/doUpgrade.go index 45ea369..81027ff 100644 --- a/doUpgrade.go +++ b/doUpgrade.go @@ -70,10 +70,10 @@ func doUpgrade() error { continue } if _, err := debian.AptInstall(p.Package); err != nil { - me.sh.BadExit("damn it", err) + me.argv.BadExit("damn it", err) } } } - me.sh.GoodExit("installed") + me.argv.GoodExit("installed") return nil } diff --git a/exit.go b/exit.go index c60766c..5dab98a 100644 --- a/exit.go +++ b/exit.go @@ -15,7 +15,7 @@ import ( // exits if not root func checkSuperuser() { if os.Getuid() != 0 { - me.sh.BadExit("need sudo", errors.New("this requires sudo acces")) + me.argv.BadExit("need sudo", errors.New("this requires sudo acces")) } } @@ -31,7 +31,7 @@ func exitOnError(cmd []string) { _, err = shell.RunVerbose(cmd) if err != nil { msg := fmt.Sprintf("Ran: %v", cmd) - me.sh.BadExit(msg, err) + me.argv.BadExit(msg, err) } } @@ -41,6 +41,6 @@ func exitOnErrorRealtime(cmd []string) { _, err = shell.RunRealtimeError(cmd) if err != nil { msg := fmt.Sprintf("Ran: %v", cmd) - me.sh.BadExit(msg, err) + me.argv.BadExit(msg, err) } } diff --git a/main.go b/main.go index 0eddea2..5672d44 100644 --- a/main.go +++ b/main.go @@ -26,17 +26,17 @@ var resources embed.FS func main() { me = new(mainType) // autocomplete must be processed before there is anything sent to STDOUT or STDERR - me.sh = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args - me.homedir, _ = os.UserHomeDir() // store shortcut here todo: add better logic + me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args + me.homedir, _ = os.UserHomeDir() // store shortcut here todo: add better logic - if me.sh.Cmd == "" { + if me.argv.Cmd == "" { // user didn't enter a sub command // doDefaultBehavior() - me.sh.GoodExit("do what?") + me.argv.GoodExit("do what?") } pwd, _ := os.Getwd() - setTitle(log.Sprintf("wit %s %s", me.sh.Cmd, pwd)) + setTitle(log.Sprintf("wit %s %s", me.argv.Cmd, pwd)) // Standard subcommand handling starts here var s string @@ -44,7 +44,7 @@ func main() { if argv.Upgrade != nil { doUpgrade() - me.sh.GoodExit("") + me.argv.GoodExit("") } if argv.Linux != nil { @@ -78,22 +78,22 @@ func main() { if argv.Clone != nil { doClone() - me.sh.GoodExit("") + me.argv.GoodExit("") } if argv.WITCOM { doWITCOM() - me.sh.GoodExit("") + me.argv.GoodExit("") } if argv.Clone != nil { doClone() - me.sh.GoodExit("") + me.argv.GoodExit("") } if argv.WITCOM { doWITCOM() - me.sh.GoodExit("") + me.argv.GoodExit("") } if argv.Upgrade != nil { @@ -106,21 +106,21 @@ func main() { if argv.Publish != nil { if err := doPublish(); err != nil { - me.sh.BadExit("doPublish failed", err) + me.argv.BadExit("doPublish failed", err) } - me.sh.GoodExit("") + me.argv.GoodExit("") } if argv.Zoo != nil { if areSuperuser() { exitOnErrorRealtime([]string{"journalctl", "-n", "100", "-f", "_SYSTEMD_UNIT=zood.service"}) } - me.sh.GoodExit("do something here") + me.argv.GoodExit("do something here") } if err != nil { - me.sh.BadExit(s, err) + me.argv.BadExit(s, err) } - me.sh.GoodExit(s) + me.argv.GoodExit(s) } // this is dumb. sync this with go-deb diff --git a/structs.go b/structs.go index 90f2013..4ab8dd7 100644 --- a/structs.go +++ b/structs.go @@ -18,7 +18,7 @@ var me *mainType // this app's variables type mainType struct { once sync.Once // one-time initialized data - sh *argvpb.Argv // more experiments for bash handling + argv *argvpb.Argv // more experiments for bash handling forge *forgepb.Forge // your customized repo preferences and settings machine *zoopb.Machine // your customized repo preferences and settings homedir string // where the user homedir is @@ -30,7 +30,7 @@ func initForge() { var err error me.forge, err = forgepb.Init() if err != nil { - me.sh.BadExit("this tool requires forge", err) + me.argv.BadExit("this tool requires forge", err) } me.forge.ScanRepoDir() me.forge.Config.DumpENV() diff --git a/upgrade.go b/upgrade.go index 98af932..f4c259d 100644 --- a/upgrade.go +++ b/upgrade.go @@ -41,5 +41,5 @@ func doAptList() { } log.Printf("%-30s %-8s %s\n", p.Package, p.Version, end) // p.PkgName) } - me.sh.GoodExit("") + me.argv.GoodExit("") } -- cgit v1.2.3