util.startup: Show brief usage on `prosody -h|-?|--help`

Seems more suitable than asking if prosodyctl was meant to be used, or
going ahead and starting.

1 files changed, 8 insertions, 1 deletions

diff --git a/util/startup.lua b/util/startup.lua
index b4dc6095..890e18ba 100644
--- a/util/startup.lua
+++ b/util/startup.lua
@@ -24,7 +24,7 @@ local default_gc_params = {
 
 local arg_settigs = {
 	prosody = {
-		short_params = { D = "daemonize"; F = "no-daemonize" };
+		short_params = { D = "daemonize"; F = "no-daemonize", h = "help", ["?"] = "help" };
 		value_params = { config = true };
 	};
 	prosodyctl = {
@@ -46,6 +46,13 @@ function startup.parse_args()
 		end
 		os.exit(1);
 	end
+	if opts.help and prosody.process_type == "prosody" then
+		print("prosody [ -D | -F ] [ --config /path/to/prosody.cfg.lua ]");
+		print("  -D, --daemonize       Run in the background")
+		print("  -F, --no-daemonize    Run in the foreground")
+		print("  --config FILE         Specify config file")
+		os.exit(0);
+	end
 	prosody.opts = opts;
 end