aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-02-24 01:35:33 +0000
committerMatthew Wild <mwild1@gmail.com>2011-02-24 01:35:33 +0000
commit4ef5a9ba3a393aedb0e44a98388e4269f65941b2 (patch)
tree96b3655db94e7b9a61e647d200e0b46cc667b110 /prosody
parent87b95d522985595b949d29a0252b3a618a1093d1 (diff)
downloadprosody-4ef5a9ba3a393aedb0e44a98388e4269f65941b2.tar.gz
prosody-4ef5a9ba3a393aedb0e44a98388e4269f65941b2.zip
prosody, prosodyctl: Use plugin_paths in addition to, not instead of, the default plugin path
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody6
1 files changed, 4 insertions, 2 deletions
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;