new GUI changesv0.0.20v0.0.19v0.0.18v0.0.17v0.0.16v0.0.15v0.0.14v0.0.13v0.0.12

1 files changed, 7 insertions, 21 deletions

diff --git a/main.go b/main.go
index a61a9ee..0d3321c 100644
--- a/main.go
+++ b/main.go
@@ -13,8 +13,7 @@ import (
 	"unicode"
 
 	"go.wit.com/dev/alexflint/arg"
-	"go.wit.com/gui"
-	"go.wit.com/lib/fhelp"
+	"go.wit.com/lib/gui/prep"
 	"go.wit.com/log"
 )
 
@@ -30,26 +29,10 @@ var resources embed.FS
 
 func main() {
 	me = new(autoType)
-	gui.InitArg()
+	prep.Bash(ARGNAME, argv.DoAutoComplete) // todo: this line should be:  prep.Bash(argv)
+	me.myGui = prep.Gui()                   // prepares the GUI package for go-args
 	me.pp = arg.MustParse(&argv)
 
-	// check if the binary is being called to test
-	// if the plugin can actually loaded. This is a hack
-	// around needing a Test() plugin load function in GO
-	if gui.IsGoPluginTestHack() {
-		gui.CheckPlugin()
-		os.Exit(0)
-	}
-
-	if argv.Bash {
-		fhelp.DoBash(ARGNAME)
-		os.Exit(0)
-	}
-	if len(argv.BashAuto) != 0 {
-		argv.doBashAuto()
-		os.Exit(0)
-	}
-
 	me.pb = NewBlocks()
 
 	/*
@@ -60,7 +43,10 @@ func main() {
 	*/
 
 	go listenForBlockEvents()
-	doGui()
+
+	me.myGui.Start() // loads the GUI toolkit
+	doGui()          // start making our forge GUI
+	debug()          // sits here forever
 	okExit("everything compiled")
 }