From 41ab0aef7a0fe030e84018973a64135b11abcd70 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Wed, 9 Aug 2017 10:34:11 -0400 Subject: [PATCH] Add missing OS_ARCH dir to global plugin paths When the global directory was added, the discovery system still attempted to search for OS_ARCH subdirectories. It has since been changed only search explicit paths. --- plugins.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins.go b/plugins.go index bf2397806..668c51654 100644 --- a/plugins.go +++ b/plugins.go @@ -1,8 +1,10 @@ package main import ( + "fmt" "log" "path/filepath" + "runtime" ) // globalPluginDirs returns directories that should be searched for @@ -18,7 +20,8 @@ func globalPluginDirs() []string { if err != nil { log.Printf("[ERROR] Error finding global config directory: %s", err) } else { - ret = append(ret, filepath.Join(dir, "plugins")) + machineDir := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH) + ret = append(ret, filepath.Join(dir, "plugins", machineDir)) } return ret