From d5759f6b09492b12325a7916b51b0caa9e17c3bd Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 22 Feb 2010 01:47:35 +0000 Subject: prosodyctl: Fix 'restart' command to not report itself as the 'stop' command (thanks albert!) --- prosodyctl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prosodyctl b/prosodyctl index 676085ee..4ee5f65a 100755 --- a/prosodyctl +++ b/prosodyctl @@ -435,7 +435,7 @@ end function commands.restart(arg) if arg[1] == "--help" then - show_usage([[stop]], [[Stop and start a running Prosody server]]); + show_usage([[restart]], [[Restart a running Prosody server]]); return 1; end -- cgit v1.2.3 From b9fac6ba28a3f09ebd0f7c0205fe942d468b76a9 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 22 Feb 2010 01:48:07 +0000 Subject: prosodyctl: Fix addplugin to support --help, and hide from the help listing (for now) --- prosodyctl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/prosodyctl b/prosodyctl index 4ee5f65a..ccc1e2f9 100755 --- a/prosodyctl +++ b/prosodyctl @@ -504,6 +504,10 @@ local http_errors = { }; function commands.addplugin(arg) + if not arg[1] or arg[1] == "--help" then + show_usage("addplugin URL", "Download and install a plugin from a URL"); + return 1; + end local url = arg[1]; if url:match("^http://") then local http = require "socket.http"; @@ -575,8 +579,8 @@ if not commands[command] then -- Show help for all commands print(""); print("Where COMMAND may be one of:\n"); - local hidden_commands = require "util.set".new{ "register", "unregister" }; - local commands_order = { "adduser", "passwd", "deluser" }; + local hidden_commands = require "util.set".new{ "register", "unregister", "addplugin" }; + local commands_order = { "adduser", "passwd", "deluser", "start", "stop", "restart" }; local done = {}; -- cgit v1.2.3