diff options
| -rwxr-xr-x | prosodyctl | 5 | ||||
| -rw-r--r-- | util/prosodyctl.lua | 8 |
2 files changed, 5 insertions, 8 deletions
@@ -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 diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index d53a7ff5..efe3f5f3 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -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 |