From ab46ef9a842a864b9c760ef85c1fc60cbbfa7bf5 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Thu, 8 Mar 2018 14:40:51 -0500 Subject: [PATCH] Do not load plugins from global directory --- src/plugin.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/plugin.cpp b/src/plugin.cpp index 789892bc..986da843 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -384,24 +384,25 @@ bool pluginSync(bool dryRun) { void pluginInit() { tagsInit(); + + // TODO + // If `/plugins/Fundamental` doesn't exist, unzip global Fundamental.zip package into `/plugins` + + // TODO + // Find all ZIP packages in `/plugins` and unzip them. + // Display error if failure + // Load core // This function is defined in core.cpp Plugin *coreManufacturer = new Plugin(); init(coreManufacturer); gPlugins.push_back(coreManufacturer); - // Load plugins from global directory - std::string globalPlugins = assetGlobal("plugins"); - info("Loading plugins from %s", globalPlugins.c_str()); - loadPlugins(globalPlugins); - // Load plugins from local directory std::string localPlugins = assetLocal("plugins"); - if (globalPlugins != localPlugins) { - mkdir(localPlugins.c_str(), 0755); - info("Loading plugins from %s", localPlugins.c_str()); - loadPlugins(localPlugins); - } + mkdir(localPlugins.c_str(), 0755); + info("Loading plugins from %s", localPlugins.c_str()); + loadPlugins(localPlugins); } void pluginDestroy() {