# HG changeset patch # User Kim Alvefur # Date 1611250758 -3600 # Node ID 7919ecdc4a726aadd74ed6acbc9e79ee7b6b74a4 # Parent c6965f3c321cb732ce428b1ff357d98a8f26524a util.prosodyctl: Use installer path prepared by util.startup diff -r c6965f3c321c -r 7919ecdc4a72 util/prosodyctl.lua --- a/util/prosodyctl.lua Mon Jan 18 17:28:34 2021 +0100 +++ b/util/prosodyctl.lua Thu Jan 21 18:39:18 2021 +0100 @@ -217,18 +217,10 @@ 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 @@ start = start; stop = stop; reload = reload; - get_path_custom_plugins = get_path_custom_plugins; call_luarocks = call_luarocks; error_messages = error_messages; };