diff options
| -rw-r--r-- | argv.go | 8 | ||||
| -rw-r--r-- | init.go | 14 | ||||
| -rw-r--r-- | plugin.go | 6 | ||||
| -rw-r--r-- | pluginCheck.go | 4 |
4 files changed, 19 insertions, 13 deletions
@@ -1,9 +1,15 @@ package gui -var argGui ArgsGui +var ArgvGui ArgsGui // these go-arg commands have been moved to go.wit.com/lib/gui/prep type ArgsGui struct { + Gui *GuiCmd `arg:"subcommand:gui" help:"open the gui"` GuiPlugin string GuiFile string } + +type GuiCmd struct { + URL string `arg:"--connect" help:"forge url"` + Plugin string `arg:"positional" help:"this is just a demo"` +} @@ -333,20 +333,20 @@ func PreInit(postMustParse func(string) string) *Node { // try to load andlabs, if that doesn't work, fall back to the console func (n *Node) Default() (string, error) { var err error - argGui.GuiPlugin = me.postMustParse("DEFAULT") + ArgvGui.GuiPlugin = me.postMustParse("DEFAULT") if me.postMustParse("VERBOSE") == "true" { INFO.SetBool(true) } - if argGui.GuiPlugin != "" { - log.Log(WARN, "New.Default() try toolkit =", argGui.GuiPlugin) - if n, err = n.LoadToolkit(argGui.GuiPlugin); err == nil { - return argGui.GuiPlugin, nil + if ArgvGui.GuiPlugin != "" { + log.Log(WARN, "New.Default() try toolkit =", ArgvGui.GuiPlugin) + if n, err = n.LoadToolkit(ArgvGui.GuiPlugin); err == nil { + return ArgvGui.GuiPlugin, nil } log.Log(WARN, "") - log.Log(WARN, "The GUI golang plugins did not load for the", argGui.GuiPlugin) + log.Log(WARN, "The GUI golang plugins did not load for the", ArgvGui.GuiPlugin) log.Log(WARN, "GO Plugin error:", err) - return argGui.GuiPlugin, err + return ArgvGui.GuiPlugin, err } if me.appPlugin != "" { if n, err = n.LoadToolkit(me.appPlugin); err == nil { @@ -171,10 +171,10 @@ func searchPaths(name string) *aplug { var p *aplug // try the filename from the command line first - if argGui.GuiFile != "" { - p = initToolkit(name, argGui.GuiFile) + if ArgvGui.GuiFile != "" { + p = initToolkit(name, ArgvGui.GuiFile) if p != nil { - log.Log(NOW, "gui.Init() loaded ok!", argGui.GuiFile) + log.Log(NOW, "gui.Init() loaded ok!", ArgvGui.GuiFile) return p } } diff --git a/pluginCheck.go b/pluginCheck.go index 8d60419..9779e8a 100644 --- a/pluginCheck.go +++ b/pluginCheck.go @@ -62,7 +62,7 @@ func checkPluginCompatibility(pluginPath string) error { func CheckPlugin() string { /* - if argGui.GuiPluginHack != "" { + if ArgvGui.GuiPluginHack != "" { // does os.Exec() and does not return TestPluginAndExit() } @@ -125,7 +125,7 @@ func checkPluginViaSubprocess(path string) error { // retuns true if func IsGoPluginTestHack() bool { /* - if argGui.GuiPluginHack == "" { + if ArgvGui.GuiPluginHack == "" { return false } */ |