From 4ef5a9ba3a393aedb0e44a98388e4269f65941b2 Mon Sep 17 00:00:00 2001
From: Matthew Wild <mwild1@gmail.com>
Date: Thu, 24 Feb 2011 01:35:33 +0000
Subject: prosody, prosodyctl: Use plugin_paths in addition to, not instead of,
the default plugin path
---
prosody | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'prosody')
diff --git a/prosody b/prosody
index 81d87153..0aba4bb6 100755
--- a/prosody
+++ b/prosody
@@ -186,10 +186,12 @@ function init_global_state()
local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
local custom_plugin_paths = config.get("*", "core", "plugin_paths");
if custom_plugin_paths then
- CFG_PLUGINDIR = table.concat(custom_plugin_paths, package.config:sub(3,3)); -- path1;path2;path3
+ local path_sep = package.config:sub(3,3);
+ -- path1;path2;path3;defaultpath...
+ CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
end
prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR,
- plugins = CFG_PLUGINDIR, data = data_path };
+ plugins = CFG_PLUGINDIR or "plugins", data = data_path };
prosody.arg = _G.arg;
--
cgit v1.2.3