diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -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 |