diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 21 |
1 files changed, 7 insertions, 14 deletions
@@ -13,24 +13,17 @@ import ( "go.wit.com/log" ) -// sent from -ldflags -var VERSION string -var BUILDTIME string - //go:embed resources/* var resources embed.FS -var ARGNAME string = "go-deb" -var argv args - func main() { me = new(mainType) - me.sh = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args + me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args me.pb = new(zoopb.Package) wd, err := os.Getwd() if err != nil { - me.sh.BadExit("your current directory does not exist err=", err) + me.argv.BadExit("your current directory does not exist err=", err) } if argv.Arch == "" { @@ -40,7 +33,7 @@ func main() { me.repo, err = gitpb.NewRepo(wd) if err != nil { - me.sh.BadExit("is this really a .git directory? err=", err) + me.argv.BadExit("is this really a .git directory? err=", err) } data, err := os.ReadFile("control") @@ -75,7 +68,7 @@ func main() { controlfile := debian.MakeControlFile(me.pb) log.Info(controlfile) log.Info("INITIAL PARSE END") - // me.sh.GoodExit("rewriting this app") + // me.argv.GoodExit("rewriting this app") // build() if argv.Show != nil { @@ -110,7 +103,7 @@ func main() { // computeControlValues(me.repo) */ - if argv.Gui != nil { + if me.argv.Gui() { // only load teh toolkit if you get this far me.myGui.Start() // loads the GUI toolkit doGui() @@ -119,9 +112,9 @@ func main() { log.Info("go-deb: attempting to build package") if ok, err := buildPackage(me.repo); ok { - me.sh.GoodExit("build worked") + me.argv.GoodExit("build worked") } else { - me.sh.BadExit("build failed", err) + me.argv.BadExit("build failed", err) } os.Exit(0) } |