Changeset

2707:749dbdbd4a00

Merge with 0.7
author Matthew Wild <mwild1@gmail.com>
date Mon, 22 Feb 2010 01:48:42 +0000
parents 2704:78af99ce9c07 (current diff) 2706:c2dde8bda3fe (diff)
children 2715:5e7eac7c1bda
files
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/prosodyctl	Mon Feb 22 01:06:46 2010 +0000
+++ b/prosodyctl	Mon Feb 22 01:48:42 2010 +0000
@@ -435,7 +435,7 @@
 
 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
 	
@@ -504,6 +504,10 @@
 	};
 
 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 @@
 	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 = {};