Software / code / prosody
Changeset
11294:a1939b261f67
prosodyctl: Move UI related calls out of util.prosodyctl
I think this follows the general separation of duties between prosodyctl
and util.prosodyctl better.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 21 Jan 2021 19:04:57 +0100 |
| parents | 11293:cd27ac5e5afe |
| children | 11295:50ea7d9143ad |
| files | prosodyctl util/prosodyctl.lua |
| diffstat | 2 files changed, 5 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/prosodyctl Thu Jan 21 19:02:03 2021 +0100 +++ b/prosodyctl Thu Jan 21 19:04:57 2021 +0100 @@ -78,8 +78,12 @@ 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 @@ 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
--- a/util/prosodyctl.lua Thu Jan 21 19:02:03 2021 +0100 +++ b/util/prosodyctl.lua Thu Jan 21 19:04:57 2021 +0100 @@ -221,11 +221,6 @@ 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 @@ if not ok then return code; end - if operation == "install" then - show_module_configuration_help(mod); - end return true; end
