From 50d9045de639159a0c5a54bdb42c23d5b72adaa1 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Thu, 21 Jan 2021 18:39:18 +0100 Subject: util.prosodyctl: Use installer path prepared by util.startup --- util/prosodyctl.lua | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'util') 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; }; -- cgit v1.2.3