diff options
| author | Matthew Wild <mwild1@gmail.com> | 2019-08-19 12:17:17 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2019-08-19 12:17:17 +0100 |
| commit | 9f32d30e97c325810bba0ce17fef4491fac2f365 (patch) | |
| tree | 0b8157172fb508a4b962032d663b6d9b2e31a600 /util/startup.lua | |
| parent | 469ce79a49fabbe0d42115fa7a2f1a27e3bae3f1 (diff) | |
| parent | 6ae5f04781c82e8064ceb9acc91ab9cfdb295969 (diff) | |
| download | prosody-9f32d30e97c325810bba0ce17fef4491fac2f365.tar.gz prosody-9f32d30e97c325810bba0ce17fef4491fac2f365.zip | |
Merge mod-installer (2019 GSoC by João Duarte)
Diffstat (limited to 'util/startup.lua')
| -rw-r--r-- | util/startup.lua | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua index ab595526..580410c9 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -227,13 +227,19 @@ end function startup.setup_plugindir() local custom_plugin_paths = config.get("*", "plugin_paths"); + local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins"; + local path_sep = package.config:sub(3,3); + installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path); + require "lfs".mkdir(installer_plugin_path); + require"util.paths".complement_lua_path(installer_plugin_path); if custom_plugin_paths then - local path_sep = package.config:sub(3,3); -- path1;path2;path3;defaultpath... -- luacheck: ignore 111 CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins"); prosody.paths.plugins = CFG_PLUGINDIR; end + CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins"); + prosody.paths.plugins = CFG_PLUGINDIR; end function startup.chdir() |