util.startup: Now it also loads default or configured paths to custom plugin directories and creates them

1 files changed, 12 insertions, 0 deletions

diff --git a/util/startup.lua b/util/startup.lua
index 7a1a95aa..65a131fe 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -227,6 +227,7 @@ end
 
 function startup.setup_plugindir()
 	local custom_plugin_paths = config.get("*", "plugin_paths");
+	local installer_plugin_paths = config.get("*", "installer_plugin_paths") or {"custom_plugins"};
 	if custom_plugin_paths then
 		local path_sep = package.config:sub(3,3);
 		-- path1;path2;path3;defaultpath...
@@ -234,6 +235,17 @@ function startup.setup_plugindir()
 		CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
 		prosody.paths.plugins = CFG_PLUGINDIR;
 	end
+	if installer_plugin_paths then
+		for path, _ in ipairs(installer_plugin_paths) do
+			if os.execute('[ -d "'..installer_plugin_paths[path]..'" ]') ~= 0 then
+				os.execute("mkdir "..installer_plugin_paths[path])
+			end
+		end
+		local path_sep = package.config:sub(3,3);
+		-- luacheck: ignore 111
+		CFG_PLUGINDIR = table.concat(installer_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
+		prosody.paths.plugins = CFG_PLUGINDIR;
+	end
 end
 
 function startup.chdir()