diff --git a/cmd/ipfs/main.go b/cmd/ipfs/main.go index 4415637af..44a270c08 100644 --- a/cmd/ipfs/main.go +++ b/cmd/ipfs/main.go @@ -172,7 +172,7 @@ func makeExecutor(req *cmds.Request, env interface{}) (cmds.Executor, error) { } if ok { if _, err := loader.LoadPlugins(pluginpath); err != nil { - log.Warning("error loading plugins: ", err) + log.Error("error loading plugins: ", err) } } diff --git a/plugin/loader/preload.go b/plugin/loader/preload.go index cc0d8651d..46dd2cb92 100644 --- a/plugin/loader/preload.go +++ b/plugin/loader/preload.go @@ -2,10 +2,13 @@ package loader import ( "github.com/ipfs/go-ipfs/plugin" + pluginipldgit "github.com/ipfs/go-ipfs/plugin/plugins/git" ) // DO NOT EDIT THIS FILE // This file is being generated as part of plugin build process // To change it, modify the plugin/loader/preload.sh -var preloadPlugins = []plugin.Plugin{} +var preloadPlugins = []plugin.Plugin{ + pluginipldgit.Plugins[0], +} diff --git a/plugin/loader/preload_list b/plugin/loader/preload_list index 8c62c673b..2905dfe1c 100644 --- a/plugin/loader/preload_list +++ b/plugin/loader/preload_list @@ -3,4 +3,4 @@ # # name go-path number of the sub-plugin -#ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0 +ipldgit github.com/ipfs/go-ipfs/plugin/plugins/git 0 diff --git a/test/sharness/t0280-plugin-git.sh b/test/sharness/t0280-plugin-git.sh index 8f912646d..24737dd45 100755 --- a/test/sharness/t0280-plugin-git.sh +++ b/test/sharness/t0280-plugin-git.sh @@ -17,11 +17,6 @@ fi test_init_ipfs -test_expect_success "copy plugin" ' - mkdir -p "$IPFS_PATH/plugins" && - cp ../plugins/git.so "$IPFS_PATH/plugins/" -' - # from https://github.com/ipfs/go-ipld-git/blob/master/make-test-repo.sh test_expect_success "prepare test data" ' tar xzf ../t0280-plugin-git-data/git.tar.gz