diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-05-17 21:49:55 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-05-17 21:49:55 +0300 |
commit | ed8389beadb7cf1f8d95fe7addbc9ff2783f4d07 (patch) | |
tree | aec21dde26528bf29fdcb232df0b997601e15c4e /src | |
parent | 41e4cf7b5ad33dcfc7f472b9392831fa197fd8e2 (diff) | |
download | genrc-ed8389beadb7cf1f8d95fe7addbc9ff2783f4d07.tar.gz genrc-ed8389beadb7cf1f8d95fe7addbc9ff2783f4d07.tar.bz2 |
Improve help output
Diffstat (limited to 'src')
-rw-r--r-- | src/genrc.c | 44 |
1 files changed, 33 insertions, 11 deletions
diff --git a/src/genrc.c b/src/genrc.c index d4904b6..ae3070d 100644 --- a/src/genrc.c +++ b/src/genrc.c | |||
@@ -161,23 +161,43 @@ char const *help_msg[] = { | |||
161 | " reload send a reload signal to the program", | 161 | " reload send a reload signal to the program", |
162 | " status display the program status", | 162 | " status display the program status", |
163 | "", | 163 | "", |
164 | "OPTIONs are:\n", | 164 | "OPTIONs are:", |
165 | " -h, --help display this help list", | 165 | "", |
166 | " --usage display short usage information", | 166 | "Command to run:", |
167 | "", | ||
167 | " -c, --command=COMMAND command line to run", | 168 | " -c, --command=COMMAND command line to run", |
168 | " -p, --program=PROGRAM name of the program to run", | 169 | " -p, --program=PROGRAM name of the program to run", |
170 | "", | ||
171 | " At least one of COMMAND or PROGRAM must be given.", | ||
172 | " If PROGRAM is supplied, but COMMAND is not, COMMAND is set to PROGRAM", | ||
173 | " Otherwise, if COMMAND is set, but PROGRAM is not, PROGRAM is set to the", | ||
174 | " first word (in the shell sense) in COMMAND.", | ||
175 | "", | ||
176 | "Runtime privileges:", | ||
177 | "", | ||
178 | " -u, --user=NAME run with this user privileges", | ||
179 | " -g, --group=GROUP[,GROUP...]]", | ||
180 | " run with this group(s) privileges", | ||
181 | "", | ||
182 | "Additional configuration:", | ||
183 | "", | ||
184 | " -t, --timeout=SECONDS time to wait for the program to start up or", | ||
185 | " terminate", | ||
186 | " --sentinel PROGRAM runs in foreground; disconnect from the", | ||
187 | " controlling terminal, run it and act as a sentinel", | ||
169 | " -P, --pid-from=SOURCE where to look for PIDs of the running programs", | 188 | " -P, --pid-from=SOURCE where to look for PIDs of the running programs", |
170 | " -F, --pidfile=NAME name of the PID file", | 189 | " -F, --pidfile=NAME name of the PID file", |
171 | " (same as --pid-from=FILE:NAME)", | 190 | " (same as --pid-from=FILE:NAME)", |
172 | " -t, --timeout=SECONDS time to wait for the program to start up or", | ||
173 | " terminate", | ||
174 | " --signal-reload=SIG signal to send on reload (default: SIGHUP)", | 191 | " --signal-reload=SIG signal to send on reload (default: SIGHUP)", |
175 | " setting to 0 is equivalent to --no-reload", | 192 | " setting to 0 is equivalent to --no-reload", |
176 | " --no-reload makes reload equivalent to restart", | 193 | " --no-reload makes reload equivalent to restart", |
177 | " --signal-stop=SIG signal to send in order to terminate the program", | 194 | " --signal-stop=SIG signal to send in order to terminate the program", |
178 | " (default: SIGTERM)", | 195 | " (default: SIGTERM)", |
179 | " --sentinel PROGRAM runs in foreground; disconnect from the", | 196 | "", |
180 | " controlling terminal, run it and act as a sentinel", | 197 | "Informational options:", |
198 | "", | ||
199 | " -h, --help display this help list", | ||
200 | " --usage display short usage information", | ||
181 | " --version display program version and exist", | 201 | " --version display program version and exist", |
182 | "", | 202 | "", |
183 | "Influential environment variables and corresponding options:", | 203 | "Influential environment variables and corresponding options:", |
@@ -187,11 +207,9 @@ char const *help_msg[] = { | |||
187 | " GENRC_PID_FROM=SOURCE --pid-from=SOURCE", | 207 | " GENRC_PID_FROM=SOURCE --pid-from=SOURCE", |
188 | " GENRC_TIMEOUT=SECONDS --timeout=SECONDS", | 208 | " GENRC_TIMEOUT=SECONDS --timeout=SECONDS", |
189 | " GENRC_SENTINEL=1 --sentinel", | 209 | " GENRC_SENTINEL=1 --sentinel", |
210 | " GENRC_USER=NAME --user=NAME", | ||
211 | " GENRC_GROUP=GROUPS --group=GROUPS", | ||
190 | "", | 212 | "", |
191 | " At least one of COMMAND or PROGRAM must be given.", | ||
192 | " If PROGRAM is supplied, but COMMAND is not, COMMAND is set to PROGRAM", | ||
193 | " Otherwise, if COMMAND is set, but PROGRAM is not, PROGRAM is set to the", | ||
194 | " first word (in the shell sense) in COMMAND.", | ||
195 | "", | 213 | "", |
196 | "PID sources:", | 214 | "PID sources:", |
197 | "", | 215 | "", |
@@ -243,9 +261,12 @@ char const *usage_msg[] = { | |||
243 | "[-F PIDFILE]", | 261 | "[-F PIDFILE]", |
244 | "[-P SOURCE]", | 262 | "[-P SOURCE]", |
245 | "[-c COMMAND]", | 263 | "[-c COMMAND]", |
264 | "[-g GROUP[,GROUP...]]", | ||
246 | "[-p PROGRAM]", | 265 | "[-p PROGRAM]", |
247 | "[-t SECONDS]", | 266 | "[-t SECONDS]", |
267 | "[-u USER]", | ||
248 | "[--command=COMMAND]", | 268 | "[--command=COMMAND]", |
269 | "[--group GROUP[,GROUP...]]", | ||
249 | "[--help]", | 270 | "[--help]", |
250 | "[--no-reload]", | 271 | "[--no-reload]", |
251 | "[--pid-from=SOURCE]", | 272 | "[--pid-from=SOURCE]", |
@@ -256,6 +277,7 @@ char const *usage_msg[] = { | |||
256 | "[--signal-stop=SIG]", | 277 | "[--signal-stop=SIG]", |
257 | "[--timeout=SECONDS]", | 278 | "[--timeout=SECONDS]", |
258 | "[--usage]", | 279 | "[--usage]", |
280 | "[--user=USER]", | ||
259 | "{", | 281 | "{", |
260 | "start", | 282 | "start", |
261 | "|", | 283 | "|", |