Changeset

11290:7919ecdc4a72

util.prosodyctl: Use installer path prepared by util.startup
author Kim Alvefur <zash@zash.se>
date Thu, 21 Jan 2021 18:39:18 +0100
parents 11289:c6965f3c321c
children 11291:9a98464a35e4
files util/prosodyctl.lua
diffstat 1 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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;
 };