From 7146762a6d73ed7a792d8c7d1100c304bcb2266e Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 24 Jan 2021 16:12:53 +0100 Subject: util.startup: Make installer_plugin_path relative to data directory 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). --- util/startup.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/startup.lua b/util/startup.lua index d6e7eca1..11225290 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -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"); -- cgit v1.2.3