Software / code / prosody
Changeset
12424:929bfe92bb56
Merge 0.12->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 21 Mar 2022 10:07:08 +0000 |
| parents | 12422:8e4a5cb2d199 (current diff) 12423:3ae9299d61d7 (diff) |
| children | 12425:eabcc3ae22e9 |
| files | |
| diffstat | 1 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/util/startup.lua Sat Mar 19 11:47:52 2022 +0000 +++ b/util/startup.lua Mon Mar 21 10:07:08 2022 +0000 @@ -46,12 +46,19 @@ 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); + if prosody.process_type == "prosody" then + if #arg > 0 then + print("Unrecognized option: "..arg[1]); + print("(Did you mean 'prosodyctl "..arg[1].."'?)"); + print(""); + end + if opts.help or #arg > 0 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 end prosody.opts = opts; end
