shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-07 17:17:44 +03:00
Code

systemctl: whitespace optimization of --help

Browse Source 
Move the explanation of options three columns to the right: then almost
all options fit and we do not need to break lines so often.

When a multi-line explanation precedes a section break, i.e. there is a
half-line on the right side, do not use an empty space. This saves a line,
and actually looks visually better because the text is still clearly
separated, but we don't get the big vertical white space.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-11-18 16:41:13 +01:00
parent 26e1e97345
commit 4d985a317a
1 changed files with 54 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/systemctl/systemctl.c
View File

@ -7866,7 +7866,7 @@ static int systemctl_help(void) {
" units\n" " units\n"
" list-dependencies [UNIT] Recursively show units which are required\n" " list-dependencies [UNIT] Recursively show units which are required\n"
" or wanted by this unit or by which this\n" " or wanted by this unit or by which this\n"
" unit is required or wanted\n" " unit is required or wanted"
"\n%3$sUnit File Commands:%4$s\n" "\n%3$sUnit File Commands:%4$s\n"
" list-unit-files [PATTERN...] List installed unit files\n" " list-unit-files [PATTERN...] List installed unit files\n"
" enable [UNIT...|PATH...] Enable one or more unit files\n" " enable [UNIT...|PATH...] Enable one or more unit files\n"
@ -7891,7 +7891,7 @@ static int systemctl_help(void) {
" get-default Get the name of the default target\n" " get-default Get the name of the default target\n"
" set-default TARGET Set the default target\n" " set-default TARGET Set the default target\n"
"\n%3$sMachine Commands:%4$s\n" "\n%3$sMachine Commands:%4$s\n"
" list-machines [PATTERN...] List local containers and host\n\n" " list-machines [PATTERN...] List local containers and host\n"
"\n%3$sJob Commands:%4$s\n" "\n%3$sJob Commands:%4$s\n"
" list-jobs [PATTERN...] List jobs\n" " list-jobs [PATTERN...] List jobs\n"
" cancel [JOB...] Cancel all, one, or more jobs\n" " cancel [JOB...] Cancel all, one, or more jobs\n"
@ -7899,7 +7899,7 @@ static int systemctl_help(void) {
" show-environment Dump environment\n" " show-environment Dump environment\n"
" set-environment VARIABLE=VALUE... Set one or more environment variables\n" " set-environment VARIABLE=VALUE... Set one or more environment variables\n"
" unset-environment VARIABLE... Unset one or more environment variables\n" " unset-environment VARIABLE... Unset one or more environment variables\n"
" import-environment [VARIABLE...] Import all or some environment variables\n\n" " import-environment [VARIABLE...] Import all or some environment variables\n"
"\n%3$sManager State Commands:%4$s\n" "\n%3$sManager State Commands:%4$s\n"
" daemon-reload Reload systemd manager configuration\n" " daemon-reload Reload systemd manager configuration\n"
" daemon-reexec Reexecute systemd manager\n" " daemon-reexec Reexecute systemd manager\n"
@ -7921,38 +7921,34 @@ static int systemctl_help(void) {
" hibernate Hibernate the system\n" " hibernate Hibernate the system\n"
" hybrid-sleep Hibernate and suspend the system\n" " hybrid-sleep Hibernate and suspend the system\n"
" suspend-then-hibernate Suspend the system, wake after a period of\n" " suspend-then-hibernate Suspend the system, wake after a period of\n"
" time and put it into hibernate\n" " time, and hibernate"
"\n%3$sOptions:%4$s\n" "\n%3$sOptions:%4$s\n"
" -h --help Show this help\n" " -h --help Show this help\n"
" --version Show package version\n" " --version Show package version\n"
" --system Connect to system manager\n" " --system Connect to system manager\n"
" --user Connect to user service manager\n" " --user Connect to user service manager\n"
" -H --host=[USER@]HOST\n" " -H --host=[USER@]HOST Operate on remote host\n"
" Operate on remote host\n" " -M --machine=CONTAINER Operate on a local container\n"
" -M --machine=CONTAINER\n"
" Operate on local container\n"
" -t --type=TYPE List units of a particular type\n" " -t --type=TYPE List units of a particular type\n"
" --state=STATE List units with particular LOAD or SUB or ACTIVE state\n" " --state=STATE List units with particular LOAD or SUB or ACTIVE state\n"
" --failed Shorcut for --state=failed\n" " --failed Shorcut for --state=failed\n"
" -p --property=NAME Show only properties by this name\n" " -p --property=NAME Show only properties by this name\n"
" -a --all Show all properties/all units currently in memory,\n" " -a --all Show all properties/all units currently in memory,\n"
" including dead/empty ones. To list all units installed on\n" " including dead/empty ones. To list all units installed\n"
" the system, use the 'list-unit-files' command instead.\n" " on the system, use 'list-unit-files' instead.\n"
" -l --full Don't ellipsize unit names on output\n" " -l --full Don't ellipsize unit names on output\n"
" -r --recursive Show unit list of host and local containers\n" " -r --recursive Show unit list of host and local containers\n"
" --reverse Show reverse dependencies with 'list-dependencies'\n" " --reverse Show reverse dependencies with 'list-dependencies'\n"
" --job-mode=MODE Specify how to deal with already queued jobs, when\n" " --job-mode=MODE Specify how to deal with already queued jobs, when\n"
" queueing a new job\n" " queueing a new job\n"
" -T --show-transaction\n" " -T --show-transaction When enqueuing a unit job, show full transaction\n"
" When enqueuing a unit job, show full transaction\n"
" --show-types When showing sockets, explicitly show their type\n" " --show-types When showing sockets, explicitly show their type\n"
" --value When showing properties, only print the value\n" " --value When showing properties, only print the value\n"
" -i --ignore-inhibitors\n" " -i --ignore-inhibitors When shutting down or sleeping, ignore inhibitors\n"
" When shutting down or sleeping, ignore inhibitors\n" " --kill-who=WHO Whom to send signal to\n"
" --kill-who=WHO Who to send signal to\n"
" -s --signal=SIGNAL Which signal to send\n" " -s --signal=SIGNAL Which signal to send\n"
" --what=RESOURCES Which types of resources to remove\n" " --what=RESOURCES Which types of resources to remove\n"
" --now Start or stop unit in addition to enabling or disabling it\n" " --now Start or stop unit after enabling or disabling it\n"
" --dry-run Only print what would be done\n" " --dry-run Only print what would be done\n"
" -q --quiet Suppress output\n" " -q --quiet Suppress output\n"
" --wait For (re)start, wait until service stopped again\n" " --wait For (re)start, wait until service stopped again\n"
@ -7962,8 +7958,7 @@ static int systemctl_help(void) {
" --no-reload Don't reload daemon after en-/dis-abling unit files\n" " --no-reload Don't reload daemon after en-/dis-abling unit files\n"
" --no-legend Do not print a legend (column headers and hints)\n" " --no-legend Do not print a legend (column headers and hints)\n"
" --no-pager Do not pipe output into a pager\n" " --no-pager Do not pipe output into a pager\n"
" --no-ask-password\n" " --no-ask-password Do not ask for system passwords\n"
" Do not ask for system passwords\n"
" --global Enable/disable/mask unit files globally\n" " --global Enable/disable/mask unit files globally\n"
" --runtime Enable/disable/mask unit files temporarily until next\n" " --runtime Enable/disable/mask unit files temporarily until next\n"
" reboot\n" " reboot\n"