diff options
| author | João Duarte <jvsDuarte08@gmail.com> | 2019-08-01 09:29:40 -0700 |
|---|---|---|
| committer | João Duarte <jvsDuarte08@gmail.com> | 2019-08-01 09:29:40 -0700 |
| commit | 9ef4fbdbf875a09014d32caf8797402801095948 (patch) | |
| tree | 189b8e048544344de5b2eb09517a602503f0ea48 | |
| parent | cc182d07959a8eb3a55f73a0039c42b256af671e (diff) | |
| download | prosody-9ef4fbdbf875a09014d32caf8797402801095948.tar.gz prosody-9ef4fbdbf875a09014d32caf8797402801095948.zip | |
util.startup: Reorganized code at setup_plugindir
| -rw-r--r-- | util/startup.lua | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/util/startup.lua b/util/startup.lua index e46f98c9..a77237d5 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -229,15 +229,15 @@ 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); + config.complement_lua_path(installer_plugin_path); if custom_plugin_paths then -- 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 - installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path); - require "lfs".mkdir(installer_plugin_path); - config.complement_lua_path(installer_plugin_path); CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins"); prosody.paths.plugins = CFG_PLUGINDIR; end |