fixup plugin loading
they have to be a main package License: MIT Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
Jakub Sztandera committed
Jul 12, 2017 at 23:39 UTC
42b0ba345f959c953d29ff1317a297ee4747dc59
3 files changed
+7
-4
plugin/loader/load_linux.go
+5
-3
@@ -17,12 +17,14 @@ func init() {
17
func linxuLoadFunc(pluginDir string) ([]iplugin.Plugin, error) {
18
var plugins []iplugin.Plugin
19
20
- filepath.Walk(pluginDir, func(fi string, info os.FileInfo, err error) error {
20
+ err := filepath.Walk(pluginDir, func(fi string, info os.FileInfo, err error) error {
21
if err != nil {
22
return err
23
}
24
if info.IsDir() {
25
- log.Warningf("found directory inside plugins directory: %s", fi)
25
+ if fi != pluginDir {
26
+ log.Warningf("found directory inside plugins directory: %s", fi)
27
+ }
28
return nil
29
}
30
@@ -42,7 +44,7 @@ func linxuLoadFunc(pluginDir string) ([]iplugin.Plugin, error) {
44
return nil
45
})
46
45
- return plugins, nil
47
+ return plugins, err
48
}
49
50
func loadPlugin(fi string) ([]iplugin.Plugin, error) {
plugin/plugins/Rules.mk
+1
@@ -5,6 +5,7 @@ $(d)_plugins_so:=$(addsuffix .so,$($(d)_plugins))
5
6
$($(d)_plugins_so): $$(DEPS_GO) ALWAYS
7
go build -buildmode=plugin -i -pkgdir "$$GOPATH/pkg/linux_amd64_dynlink" $(go-flags-with-tags) -o "$@" "$(call go-pkg-name,$(basename $@))"
8
+ chmod +x "$@"
9
10
CLEAN += $($(d)_plugins_so)
11
plugin/plugins/git/git.go
+1
-1
@@ -1,4 +1,4 @@
1
-package git
1
+package main
2
3
import (
4
"compress/zlib"