aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-01-21 18:39:18 +0100
committerKim Alvefur <zash@zash.se>2021-01-21 18:39:18 +0100
commit50d9045de639159a0c5a54bdb42c23d5b72adaa1 (patch)
treeefa5aba8c6f41f7dbd082581d0047fdbad664684
parent0a420813db3df91505b73f76a8d8d65578c04ea9 (diff)
downloadprosody-50d9045de639159a0c5a54bdb42c23d5b72adaa1.tar.gz
prosody-50d9045de639159a0c5a54bdb42c23d5b72adaa1.zip
util.prosodyctl: Use installer path prepared by util.startup
-rw-r--r--util/prosodyctl.lua11
1 files changed, 1 insertions, 10 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 80052163..c15bdbc6 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -217,18 +217,10 @@ local function reload()
return true;
end
-local function get_path_custom_plugins(plugin_paths)
- -- I'm considering that the custom plugins' path is the first one at prosody.paths.plugins
- -- luacheck: ignore 512
- for path in plugin_paths:gmatch("[^;]+") do
- return path;
- end
-end
-
local render_cli = interpolation.new("%b{}", function (s) return "'"..s:gsub("'","'\\''").."'" end)
local function call_luarocks(operation, mod, server)
- local dir = get_path_custom_plugins(prosody.paths.plugins);
+ local dir = prosody.paths.installer;
if operation == "install" then
show_message("Installing %s at %s", mod, dir);
elseif operation == "remove" then
@@ -256,7 +248,6 @@ return {
start = start;
stop = stop;
reload = reload;
- get_path_custom_plugins = get_path_custom_plugins;
call_luarocks = call_luarocks;
error_messages = error_messages;
};