From 1441f90e5a4032c7419e252cc12c6e406d996ed3 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 9 Sep 2025 03:16:43 -0500 Subject: smarter init() --- pluginCheck.go | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'pluginCheck.go') diff --git a/pluginCheck.go b/pluginCheck.go index f1514a3..b0369b2 100644 --- a/pluginCheck.go +++ b/pluginCheck.go @@ -60,19 +60,6 @@ func checkPluginCompatibility(pluginPath string) error { return nil } -/* -// tests the plugin file will load -func testPluginOld() { - _, err := plugin.Open(argGui.GuiPluginHack) - if err != nil { - log.Log(PLUG, "plugin.Open() FAILED =", argGui.GuiPluginHack, err) - os.Exit(-1) - } - log.Log(PLUG, "plugin.Open() SUCCESS loading plugin =", argGui.GuiPluginHack) - os.Exit(0) -} -*/ - func CheckPlugin() string { if argGui.GuiPluginHack != "" { // does os.Exec() and does not return @@ -85,26 +72,29 @@ func CheckPlugin() string { // this is a workaround for GO plugins not cleaning up correctly after // an attempt to load them func TestPluginAndExit() { - log.Log(WARN, "TEST plugin START", argGui.GuiPluginHack) +} + +func TestPluginAndExitNew(hackname string) { + log.Log(WARN, "TEST plugin START", hackname) - absPath, err := filepath.Abs(argGui.GuiPluginHack) + absPath, err := filepath.Abs(hackname) if err != nil { - log.Log(WARN, "TEST plugin FAILED", argGui.GuiPluginHack, absPath, err) + log.Log(WARN, "TEST plugin FAILED", hackname, absPath, err) os.Exit(-1) } - log.Log(WARN, "TEST plugin START abs:", absPath, argGui.GuiPluginHack) + log.Log(WARN, "TEST plugin START abs:", absPath, hackname) plug, err := checkPlug(absPath) if plug == nil { - log.Log(WARN, "TEST plugin failed (returned nil):", argGui.GuiPluginHack, absPath, err) + log.Log(WARN, "TEST plugin failed (returned nil):", hackname, absPath, err) os.Exit(-1) } if err == nil { - log.Log(WARN, "TEST plugin probably worked", argGui.GuiPluginHack, absPath) + log.Log(WARN, "TEST plugin probably worked", hackname, absPath) log.Log(WARN, "os.Exit(0)") os.Exit(0) } - log.Log(WARN, "TEST plugin failed", argGui.GuiPluginHack, absPath, err) + log.Log(WARN, "TEST plugin failed", hackname, absPath, err) os.Exit(-1) } -- cgit v1.2.3