mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

prosodyctl: Move UI related calls out of util.prosodyctl

Browse source 
I think this follows the general separation of duties between prosodyctl
and util.prosodyctl better.
This commit is contained in:
Kim Alvefur 2021-01-21 19:04:57 +01:00
parent 07e3f4ace8
commit bd62b3bce7
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
prosodyctl
View file

@ -78,8 +78,12 @@ function commands.install(arg)
show_usage([[install]], [[Installs a prosody/luarocks plugin]]);
return 1;
end
show_message("Installing %s in %s", arg[1], prosody.paths.installer);
-- TODO finalize config option name
local ret = call_luarocks("install", arg[1], configmanager.get("*", "plugin_server") or "http://localhost/");
if ret == 0 and operation == "install" then
show_module_configuration_help(mod);
end
return ret;
end
@ -88,6 +92,7 @@ function commands.remove(arg)
show_usage([[remove]], [[Removes a module installed in the working directory's plugins folder]]);
return 1;
end
show_message("Removing %s from %s", arg[1], prosody.paths.installer);
local ret = call_luarocks("remove", arg[1]);
return ret;
end

8
util/prosodyctl.lua
View file

@ -221,11 +221,6 @@ local render_cli = interpolation.new("%b{}", function (s) return "'"..s:gsub("'"
local function call_luarocks(operation, mod, server)
local dir = prosody.paths.installer;
if operation == "install" then
show_message("Installing %s in %s", mod, dir);
elseif operation == "remove" then
show_message("Removing %s from %s", mod, dir);
end
local ok, where, code = os.execute(render_cli("luarocks {op} --tree={dir} {server&--server={server}} {mod?}", {
dir = dir; op = operation; mod = mod; server = server;
}));
@ -233,9 +228,6 @@ local function call_luarocks(operation, mod, server)
if not ok then
return code;
end
if operation == "install" then
show_module_configuration_help(mod);
end
return true;
end