diff options
author | Holger Schurig <holgerschurig@gmail.com> | 2014-05-13 10:28:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-14 10:03:43 +0200 |
commit | f1f532084a6e9ee8225f047353999b459455df7e (patch) | |
tree | f2b8b1f25c5c630209c6970e3a7ce57a3d55d367 /commands/menutree.c | |
parent | ab23d0bb3f66cfb7a97a8aa6b8007687ed7a6925 (diff) | |
download | barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.gz barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.xz |
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/menutree.c')
-rw-r--r-- | commands/menutree.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/commands/menutree.c b/commands/menutree.c index 4defa661f4..5d30b67ee5 100644 --- a/commands/menutree.c +++ b/commands/menutree.c @@ -32,30 +32,28 @@ static int do_menutree(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(menutree) -BAREBOX_CMD_HELP_USAGE("menutree [OPTIONS]\n") -"\n" -"Create a menu from a directory structure\n" -"Each menu entry is described by a subdirectory. Each subdirectory\n" -"can contain the following files which further describe the entry:\n" -"\n" -"title - A file containing the title of the entry as shown in the menu\n" -"box - If present, the entry is a 'bool' entry. The file contains a variable\n" -" name from which the current state of the bool is taken from and saved\n" -" to.\n" -"action - if present this file contains a shell script which is executed when\n" -" when the entry is selected.\n" -"If neither 'box' or 'action' are present this entry is considered a submenu\n" -"containing more entries.\n" -"\n" -"Options:\n" -" -m <dir> directory where the menu starts (/env/menu)\n" - +BAREBOX_CMD_HELP_TEXT("Each menu entry is described by a subdirectory. Each subdirectory") +BAREBOX_CMD_HELP_TEXT("can contain the following files which further describe the entry:") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("title A file containing the title of the entry as shown in the menu") +BAREBOX_CMD_HELP_TEXT("box If present, the entry is a 'bool' entry. The file contains a") +BAREBOX_CMD_HELP_TEXT(" name from which the current state of the bool is taken from and saved") +BAREBOX_CMD_HELP_TEXT(" to.") +BAREBOX_CMD_HELP_TEXT("action if present this file contains a shell script which is executed when") +BAREBOX_CMD_HELP_TEXT(" when the entry is selected.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("If neither 'box' or 'action' are present, this entry is considered a submenu") +BAREBOX_CMD_HELP_TEXT("containing more entries.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-m DIR", "directory where the menu starts (Default: /env/menu)") BAREBOX_CMD_HELP_END BAREBOX_CMD_START(menutree) .cmd = do_menutree, - .usage = "create a menu from a directory structure", + BAREBOX_CMD_DESC("create menu from directory structure") + BAREBOX_CMD_OPTS("[-m] DIR") BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) BAREBOX_CMD_HELP(cmd_menutree_help) BAREBOX_CMD_END |