From 42b0ba345f959c953d29ff1317a297ee4747dc59 Mon Sep 17 00:00:00 2001
From: Jakub Sztandera <kubuxu@protonmail.ch>
Date: Wed, 12 Jul 2017 23:39:23 +0200
Subject: [PATCH] fixup plugin loading

they have to be a main package

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
---
 plugin/loader/load_linux.go | 8 +++++---
 plugin/plugins/Rules.mk     | 1 +
 plugin/plugins/git/git.go   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/plugin/loader/load_linux.go b/plugin/loader/load_linux.go
index 511b42d53..d74c91bf6 100644
--- a/plugin/loader/load_linux.go
+++ b/plugin/loader/load_linux.go
@@ -17,12 +17,14 @@ func init() {
 func linxuLoadFunc(pluginDir string) ([]iplugin.Plugin, error) {
 	var plugins []iplugin.Plugin
 
-	filepath.Walk(pluginDir, func(fi string, info os.FileInfo, err error) error {
+	err := filepath.Walk(pluginDir, func(fi string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}
 		if info.IsDir() {
-			log.Warningf("found directory inside plugins directory: %s", fi)
+			if fi != pluginDir {
+				log.Warningf("found directory inside plugins directory: %s", fi)
+			}
 			return nil
 		}
 
@@ -42,7 +44,7 @@ func linxuLoadFunc(pluginDir string) ([]iplugin.Plugin, error) {
 		return nil
 	})
 
-	return plugins, nil
+	return plugins, err
 }
 
 func loadPlugin(fi string) ([]iplugin.Plugin, error) {
diff --git a/plugin/plugins/Rules.mk b/plugin/plugins/Rules.mk
index 381696be0..570f0ba33 100644
--- a/plugin/plugins/Rules.mk
+++ b/plugin/plugins/Rules.mk
@@ -5,6 +5,7 @@ $(d)_plugins_so:=$(addsuffix .so,$($(d)_plugins))
 
 $($(d)_plugins_so): $$(DEPS_GO) ALWAYS
 	go build -buildmode=plugin -i -pkgdir "$$GOPATH/pkg/linux_amd64_dynlink" $(go-flags-with-tags) -o "$@" "$(call go-pkg-name,$(basename $@))"
+	chmod +x "$@"
 
 CLEAN += $($(d)_plugins_so)
 
diff --git a/plugin/plugins/git/git.go b/plugin/plugins/git/git.go
index 5a0763301..f7cab2a6a 100644
--- a/plugin/plugins/git/git.go
+++ b/plugin/plugins/git/git.go
@@ -1,4 +1,4 @@
-package git
+package main
 
 import (
 	"compress/zlib"