Comparison

prosodyctl: 'about' becomes 'version -v', 'version' prints only version The 'about' command remains for backwards compatibility, but hidden.

comparison

equal deleted inserted replaced

-:df32fff0963d
+:c0b6b6a12228
 		print(name..":"..string.rep(" ", longest_name-#name), version);
 	end
 	print("");
 end
+function commands.version(arg)
+	local flags = { short_params = { h = "help"; ["?"] = "help", v = "verbose" } };
+	local opts = parse_args(arg, flags);
+	if opts.help then
+		show_usage("version [-v]", [[Show current Prosody version, or more]]);
+		return 0;
+	elseif opts.verbose then
+		return commands.about(arg);
+	end
+	print("Prosody "..(prosody.version or "(unknown version)"));
+end
 function commands.reload(arg)
 	local opts = parse_args(arg, only_help);
 	if opts.help then
 		show_usage([[reload]], [[Reload Prosody's configuration and re-open log files]]);
 		return 0;
 		end
 	end
 	if not commands[command] then -- Show help for all commands
 		function show_usage(usage, desc)
-			print(string.format(" %-11s    %s", usage, desc));
+			print(string.format(" %-14s    %s", usage, desc));
 		end
 		print("prosodyctl - Manage a Prosody server");
 		print("");
 		print("Usage: "..arg[0].." COMMAND [OPTIONS]");
 			"User management:",
 				"adduser"; "passwd"; "deluser";
 			"Plugin management:",
 				"install"; "remove"; "list";
 			"Informative:",
-				"about",
 				"check",
+				"version",
 			"Other:",
 				"cert",
 		};
 		-- These live in util.prosodyctl.$command so we have their short help here.
 		local external_commands = {