go mod tidy for toolkit movev0.10.1

Signed-off-by: Jeff Carr <[email protected]>

3 files changed, 20 insertions, 37 deletions

diff --git a/go.mod b/go.mod
index 1e64850..125588a 100644
--- a/go.mod
+++ b/go.mod
@@ -4,13 +4,11 @@ go 1.21.4
 
 require (
 	github.com/alexflint/go-arg v1.4.3
-	github.com/sourcegraph/conc v0.3.0
-	go.wit.com/log v0.0.0-20240101060000-bf41970f7793
+	go.wit.com/gui/toolkits v0.4.1
+	go.wit.com/log v0.3.1
 )
 
 require (
 	github.com/alexflint/go-scalar v1.1.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
+	go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 // indirect
 )
diff --git a/go.sum b/go.sum
index e9a5b8a..6cd8faa 100644
--- a/go.sum
+++ b/go.sum
@@ -7,21 +7,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
-github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
-go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
-go.wit.com/log v0.0.0-20240101060000-bf41970f7793 h1:kLs+rU96k6b48DqpkO4n3yDZ8hjiVnYjzPSEHU+93aY=
-go.wit.com/log v0.0.0-20240101060000-bf41970f7793/go.mod h1:uXgfF8oPx5KYhtNZel6gsFYPMr9+z6sav5lSws1mN6A=
+go.wit.com/gui/toolkits v0.4.1 h1:Kw9gTAajHwQShuK8MOj8UizGPeY5hOtDfvAxYpDXjUw=
+go.wit.com/gui/toolkits v0.4.1/go.mod h1:f2QuC3z15/JxNnwujyFkgvkYjBS1fy0ni+QQ9idZnWQ=
+go.wit.com/log v0.3.1 h1:UXtgJ4dwyWL0Yv4mw6gQnlmrIQU/zz6nClCB7NGKBQs=
+go.wit.com/log v0.3.1/go.mod h1:GmsggfsKrqdZdAj26fEOlcTz6qEIazbV33uyuuktvB8=
+go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 h1:UEX2EzLQPzLTfy/kUFQD7OXtvKn8wk/+jpDOkbl4ff4=
+go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9/go.mod h1:qBpgJXThMMT15vym7/E4Ur9y8oOo2nP7t2RP52QHUNw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/plugin.go b/plugin.go
index c0bd811..f8212e8 100644
--- a/plugin.go
+++ b/plugin.go
@@ -134,7 +134,7 @@ func searchPaths(name string) *aplug {
 	}
 
 	// attempt to write out the file from the internal resource
-	filename = "toolkit/" + name + ".so"
+	filename = "toolkits/" + name + ".so"
 	p := initToolkit(name, filename)
 	if (p != nil) {
 		return p
@@ -142,33 +142,23 @@ func searchPaths(name string) *aplug {
 
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
-		log.Error(err, "searchPaths() error. exiting here?")
-	} else {
-		filename = homeDir + "/go/src/go.wit.com/gui/toolkits/" + name + ".so"
-		p = initToolkit(name, filename)
-		if (p != nil) {
-			return p
-		}
+		log.Error(err, "os.UserHomeDir() error. giving up")
+		return nil
 	}
 
-	homeDir, err = os.UserHomeDir()
-	if err != nil {
-		log.Error(err, "searchPaths() error. exiting here?")
-	} else {
-		filename = homeDir + "/go/src/go.wit.com/toolkits/" + name + ".so"
-		p = initToolkit(name, filename)
-		if (p != nil) {
-			return p
-		}
+	filename = homeDir + "/go/src/go.wit.com/gui/toolkits/" + name + ".so"
+	p = initToolkit(name, filename)
+	if (p != nil) {
+		return p
 	}
 
-	filename = "/usr/lib/go-gui/" + name + ".so"
+	filename = "/usr/lib/go-gui/latest/" + name + ".so"
 	p = initToolkit(name, filename)
 	if (p != nil) {
 		return p
 	}
 
-	filename = "/usr/local/lib/" + name + ".so"
+	filename = "/usr/local/lib/gui/toolkits/" + name + ".so"
 	p = initToolkit(name, filename)
 	if (p != nil) {
 		return p