# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1298511333 0
# Node ID 3e680514df14637f462cf276205dd2fff60f9a44
# Parent  bef732980436d1c09061b13ca586b2729b528235
prosody, prosodyctl: Use plugin_paths in addition to, not instead of, the default plugin path

diff -r bef732980436 -r 3e680514df14 prosody
--- a/prosody	Wed Feb 23 18:31:48 2011 +0000
+++ b/prosody	Thu Feb 24 01:35:33 2011 +0000
@@ -186,10 +186,12 @@
 	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;
 
diff -r bef732980436 -r 3e680514df14 prosodyctl
--- a/prosodyctl	Wed Feb 23 18:31:48 2011 +0000
+++ b/prosodyctl	Thu Feb 24 01:35:33 2011 +0000
@@ -112,10 +112,12 @@
 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 };
 
 require "core.loggingmanager"