mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.startup: Make installer_plugin_path relative to data directory

Browse source 
Having it relative to current working directory is problematic since
this depends on how Prosody was started and changes to the data
directory during startup (but after this point).
This commit is contained in:
Kim Alvefur 2021-01-24 16:12:53 +01:00
parent 27c7ee73b7
commit 48bc14c169
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
util/startup.lua
View file

@ -267,10 +267,9 @@ function startup.setup_plugindir()
end
function startup.setup_plugin_install_path()
local installer_plugin_path = config.get("*", "installer_plugin_path") or (CFG_DATADIR or "data").."/custom_plugins";
local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins";
local path_sep = package.config:sub(3,3);
-- TODO Figure out what this should be relative to, because CWD could be anywhere
installer_plugin_path = config.resolve_relative_path(require "lfs".currentdir(), installer_plugin_path);
installer_plugin_path = config.resolve_relative_path(CFG_DATADIR or "data", installer_plugin_path);
require"util.paths".complement_lua_path(installer_plugin_path);
-- luacheck: ignore 111
CFG_PLUGINDIR = installer_plugin_path..path_sep..(CFG_PLUGINDIR or "plugins");