aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2020-10-05 21:43:47 +0200
committerKim Alvefur <zash@zash.se>2020-10-05 21:43:47 +0200
commit63864afb77fdde6a3a4be80254bab4dbfb66db20 (patch)
treec194c9d5ce1999bed3ba58e15606819478f90406 /util
parent1dba3e8c9d1159ac25639331f58fb5627454a465 (diff)
downloadprosody-63864afb77fdde6a3a4be80254bab4dbfb66db20.tar.gz
prosody-63864afb77fdde6a3a4be80254bab4dbfb66db20.zip
util.startup: Put 'installer_plugin_path' under data directory by default
Fixes issue where it ends up creating this in $PWD, which might be ~prosody, ~you or /, depending on how it's invoked.
Diffstat (limited to 'util')
-rw-r--r--util/startup.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/startup.lua b/util/startup.lua
index a8d8594c..339a11dc 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -260,7 +260,7 @@ function startup.setup_plugindir()
end
function startup.setup_plugin_install_path()
- local installer_plugin_path = config.get("*", "installer_plugin_path") or "custom_plugins";
+ local installer_plugin_path = config.get("*", "installer_plugin_path") or CFG_DATADIR.."/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);