shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-12 13:18:14 +03:00
Code

Merge pull request #15618 from keszybz/help-output

Browse Source 
Small adjustments to --help output
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-04-28 19:31:16 +02:00 committed by GitHub
commit 2344aefccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1122 additions and 1049 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2115
meson.build
View File

File diff suppressed because it is too large Load Diff

24
src/home/homectl.c
View File

@ -190,9 +190,9 @@ static int list_homes(int argc, char *argv[], void *userdata) {
if (arg_legend && !arg_json) {
if (table_get_rows(table) > 1)
printf("\n%zu homes listed.\n", table_get_rows(table) - 1);
printf("\n%zu home areas listed.\n", table_get_rows(table) - 1);
else
printf("No homes.\n");
printf("No home areas.\n");
}
return 0;
@ -2134,20 +2134,20 @@ static int help(int argc, char *argv[], void *userdata) {
printf("%1$s [OPTIONS...] COMMAND ...\n\n"
"%2$sCreate, manipulate or inspect home directories.%3$s\n"
"\n%4$sCommands:%5$s\n"
" list List homes\n"
" activate USER… Activate home\n"
" deactivate USER… Deactivate home\n"
" inspect USER… Inspect home\n"
" authenticate USER… Authenticate home\n"
" list List home areas\n"
" activate USER… Activate a home area\n"
" deactivate USER… Deactivate a home area\n"
" inspect USER… Inspect a home area\n"
" authenticate USER… Authenticate a home area\n"
" create USER Create a home area\n"
" remove USER… Remove a home area\n"
" update USER Update a home area\n"
" passwd USER Change password of a home area\n"
" resize USER SIZE Resize a home area\n"
" lock USER… Temporarily lock an active home\n"
" unlock USER… Unlock a temporarily locked home\n"
" lock-all Lock all suitable homes\n"
" with USER [COMMAND…] Run shell or command with access to home\n"
" lock USER… Temporarily lock an active home area\n"
" unlock USER… Unlock a temporarily locked home area\n"
" lock-all Lock all suitable home areas\n"
" with USER [COMMAND…] Run shell or command with access to a home area\n"
"\n%4$sOptions:%5$s\n"
" -h --help Show this help\n"
" --version Show package version\n"
@ -2248,7 +2248,7 @@ static int help(int argc, char *argv[], void *userdata) {
"\n%4$sCIFS User Record Properties:%5$s\n"
" --cifs-domain=DOMAIN CIFS (Windows) domain\n"
" --cifs-user-name=USER CIFS (Windows) user name\n"
" --cifs-service=SERVICE CIFS (Windows) service to mount as home\n"
" --cifs-service=SERVICE CIFS (Windows) service to mount as home area\n"
"\n%4$sLogin Behaviour User Record Properties:%5$s\n"
" --stop-delay=SECS How long to leave user services running after\n"
" logout\n"

32
src/userdb/userdbctl.c
View File

@ -581,24 +581,24 @@ static int help(int argc, char *argv[], void *userdata) {
printf("%s [OPTIONS...] COMMAND ...\n\n"
"%sShow user and group information.%s\n"
"\nCommands:\n"
" user [USER…] Inspect user\n"
" group [GROUP…] Inspect group\n"
" users-in-group [GROUP…] Show users that are members of specified group(s)\n"
" groups-of-user [USER…] Show groups the specified user(s) is a member of\n"
" services Show enabled database services\n"
" user [USER…] Inspect user\n"
" group [GROUP…] Inspect group\n"
" users-in-group [GROUP…] Show users that are members of specified group(s)\n"
" groups-of-user [USER…] Show groups the specified user(s) is a member of\n"
" services Show enabled database services\n"
"\nOptions:\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" --no-legend Do not show the headers and footers\n"
" --output=MODE Select output mode (classic, friendly, table, json)\n"
" -j Equivalent to --output=json\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" --no-legend Do not show the headers and footers\n"
" --output=MODE Select output mode (classic, friendly, table, json)\n"
" -j Equivalent to --output=json\n"
" -s --service=SERVICE[:SERVICE…]\n"
" Query the specified service\n"
" --with-nss=BOOL Control whether to include glibc NSS data\n"
" -N Disable inclusion of glibc NSS data and disable synthesizing\n"
" (Same as --with-nss=no --synthesize=no)\n"
" --synthesize=BOOL Synthesize root/nobody user\n"
" Query the specified service\n"
" --with-nss=BOOL Control whether to include glibc NSS data\n"
" -N Do not synthesize or include glibc NSS data\n"
" (Same as --synthesize=no --with-nss=no)\n"
" --synthesize=BOOL Synthesize root/nobody user\n"
"\nSee the %s for details.\n"
, program_invocation_short_name
, ansi_highlight(), ansi_normal()