summaryrefslogtreecommitdiff
path: root/shell-completion
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-08-24 10:41:30 +0200
committerYu Watanabe <watanabe.yu+github@gmail.com>2022-08-26 11:15:44 +0900
commit4ccde410a3fc141c9ddf285f24a22dfea99e0287 (patch)
tree7cf167007dca0a7b1f77e9be3909f11e9b9a9ded /shell-completion
parent2f968def113e601baf8a7dc65263f2f12bc4dc16 (diff)
downloadsystemd-4ccde410a3fc141c9ddf285f24a22dfea99e0287.tar.gz
tree-wide: change --kill-who to --kill-whom
getopt allows non-ambiguous abbreviations, so backwards-compat is maintained, and people can use --kill-who (or even shorter abbreviations). English is flexible, so in common speach people would use both forms, even if "whom" is technically more correct. The advantage of using the longer form in the code is that we effectively allow both forms, so we stop punishing people who DTGCT¹, but still allow people to use the spoken form if they prefer. 1. Do the gramatically correct thing
Diffstat (limited to 'shell-completion')
-rw-r--r--shell-completion/bash/loginctl4
-rw-r--r--shell-completion/bash/machinectl4
-rw-r--r--shell-completion/bash/systemctl.in4
-rw-r--r--shell-completion/zsh/_loginctl2
-rw-r--r--shell-completion/zsh/_machinectl2
-rw-r--r--shell-completion/zsh/_systemctl.in2
6 files changed, 9 insertions, 9 deletions
diff --git a/shell-completion/bash/loginctl b/shell-completion/bash/loginctl
index b98b019aa4..7af848fdd1 100644
--- a/shell-completion/bash/loginctl
+++ b/shell-completion/bash/loginctl
@@ -42,7 +42,7 @@ _loginctl () {
local -A OPTS=(
[STANDALONE]='--all -a --help -h --no-pager --version
--no-legend --no-ask-password -l --full --value'
- [ARG]='--host -H --kill-who --property -p --signal -s -M --machine
+ [ARG]='--host -H --kill-whom --property -p --signal -s -M --machine
-n --lines -o --output -P'
)
@@ -52,7 +52,7 @@ _loginctl () {
_signals
return
;;
- --kill-who)
+ --kill-whom|--kill-who)
comps='all leader'
;;
--host|-H)
diff --git a/shell-completion/bash/machinectl b/shell-completion/bash/machinectl
index b37b059708..ebac999897 100644
--- a/shell-completion/bash/machinectl
+++ b/shell-completion/bash/machinectl
@@ -36,7 +36,7 @@ _machinectl() {
local -A OPTS=(
[STANDALONE]='--all -a -l --full --help -h --no-ask-password --no-legend --no-pager --version --value
--mkdir --read-only --force -q --quiet'
- [ARG]='--host -H --kill-who -M --machine --property -p --signal -s --uid -E --setenv -n --lines
+ [ARG]='--host -H --kill-whom -M --machine --property -p --signal -s --uid -E --setenv -n --lines
-o --output --verify --format --max-addresses'
)
@@ -64,7 +64,7 @@ _machinectl() {
_signals
return
;;
- --kill-who)
+ --kill-whom|--kill-who)
comps='all leader'
;;
--host|-H)
diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in
index c8ca2882c0..a3e423b845 100644
--- a/shell-completion/bash/systemctl.in
+++ b/shell-completion/bash/systemctl.in
@@ -128,7 +128,7 @@ _systemctl () {
--help -h --no-ask-password --no-block --legend=no --no-pager --no-reload --no-wall --now
--quiet -q --system --user --version --runtime --recursive -r --firmware-setup
--show-types --plain --failed --value --fail --dry-run --wait'
- [ARG]='--host -H --kill-who --property -p --signal -s --type -t --state --job-mode --root
+ [ARG]='--host -H --kill-whom --property -p --signal -s --type -t --state --job-mode --root
--preset-mode -n --lines -o --output -M --machine --message --timestamp --check-inhibitors'
)
@@ -156,7 +156,7 @@ _systemctl () {
comps='fail replace replace-irreversibly isolate
ignore-dependencies ignore-requirements flush'
;;
- --kill-who)
+ --kill-whom|--kill-who)
comps='all control main'
;;
--root)
diff --git a/shell-completion/zsh/_loginctl b/shell-completion/zsh/_loginctl
index 6478a52fe4..5473020e3d 100644
--- a/shell-completion/zsh/_loginctl
+++ b/shell-completion/zsh/_loginctl
@@ -169,7 +169,7 @@ _arguments -s \
'--version[Show package version]' \
\*{-p+,--property=}'[Show only properties by this name]:unit property' \
{-a,--all}'[Show all properties, including empty ones]' \
- '--kill-who=[Who to send signal to]:killwho:(main control all)' \
+ '--kill-whom=[Whom to send signal to]:killwhom:(main control all)' \
{-s+,--signal=}'[Which signal to send]:signal:_signals' \
{-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \
{-M+,--machine=}'[Operate on local container]:machine:_sd_machines' \
diff --git a/shell-completion/zsh/_machinectl b/shell-completion/zsh/_machinectl
index 8f4e57f123..4b4d044ec8 100644
--- a/shell-completion/zsh/_machinectl
+++ b/shell-completion/zsh/_machinectl
@@ -95,7 +95,7 @@ _arguments \
{-a,--all}'[Show all properties.]' \
{-q,--quiet}'[Suppress output.]' \
{-l,--full}'[Do not ellipsize cgroup members.]' \
- '--kill-who=[Who to send signal to.]:killwho:(leader all)' \
+ '--kill-whom=[Whom to send signal to.]:killwhom:(leader all)' \
{-s+,--signal=}'[Which signal to send.]:signal:_signals' \
'--read-only[Create read-only bind mount.]' \
'--mkdir[Create directory before bind mounting, if missing.]' \
diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in
index 8b8c59e0d7..3d3fbdf32a 100644
--- a/shell-completion/zsh/_systemctl.in
+++ b/shell-completion/zsh/_systemctl.in
@@ -489,7 +489,7 @@ _arguments -s \
'--global[Enable/disable/mask default user unit files globally]' \
"--no-reload[When enabling/disabling unit files, don't reload daemon configuration]" \
'--no-ask-password[Do not ask for system passwords]' \
- '--kill-who=[Who to send signal to]:killwho:(main control all)' \
+ '--kill-whom=[Whom to send signal to]:killwhom:(main control all)' \
{-s+,--signal=}'[Which signal to send]:signal:_signals' \
{-f,--force}'[When enabling unit files, override existing symlinks. When shutting down, execute action immediately]' \
'--root=[Enable/disable/mask unit files in the specified root directory]:directory:_directories' \