diff options
| -rw-r--r-- | shell-completion/bash/busctl | 74 | ||||
| -rw-r--r-- | shell-completion/bash/loginctl | 2 | ||||
| -rw-r--r-- | shell-completion/bash/systemctl | 4 | ||||
| -rw-r--r-- | shell-completion/bash/systemd-analyze | 2 | ||||
| -rw-r--r-- | shell-completion/zsh/_busctl | 54 | ||||
| -rw-r--r-- | src/libsystemd-bus/busctl.c | 2 |
6 files changed, 134 insertions, 4 deletions
diff --git a/shell-completion/bash/busctl b/shell-completion/bash/busctl new file mode 100644 index 0000000000..8ce813f4b3 --- /dev/null +++ b/shell-completion/bash/busctl @@ -0,0 +1,74 @@ +# hostnamectl(1) completion -*- shell-script -*- +# +# This file is part of systemd. +# +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +__contains_word () { + local w word=$1; shift + for w in "$@"; do + [[ $w = "$word" ]] && return + done +} + +_busctl() { + local i verb comps + local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} + local -A OPTS=( + [STANDALONE]='-h --help --version --no-pager --system --user + --no-unique --no-machine' + [ARG]='-H --host -M --machine --address + --match' + ) + + if __contains_word "$prev" ${OPTS[ARG]}; then + case $prev in + --host|-H) + comps=$(compgen -A hostname) + ;; + esac + COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) + return 0 + fi + + if [[ "$cur" = -* ]]; then + COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) + return 0 + fi + + local -A VERBS=( + [STANDALONE]='list monitor' + ) + + for ((i=0; i <= COMP_CWORD; i++)); do + if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} && + ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then + verb=${COMP_WORDS[i]} + break + fi + done + + if [[ -z $verb ]]; then + comps=${VERBS[*]} + elif __contains_word "$verb" ${VERBS[STANDALONE]}; then + comps='' + fi + + COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) + return 0 +} + +complete -F _busctl busctl diff --git a/shell-completion/bash/loginctl b/shell-completion/bash/loginctl index 3104b305fa..b0816a3b86 100644 --- a/shell-completion/bash/loginctl +++ b/shell-completion/bash/loginctl @@ -70,7 +70,7 @@ _loginctl () { [ATTACH]='attach' ) - for ((i=0; $i <= $COMP_CWORD; i++)); do + for ((i=0; i <= COMP_CWORD; i++)); do if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} && ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then verb=${COMP_WORDS[i]} diff --git a/shell-completion/bash/systemctl b/shell-completion/bash/systemctl index e96b1f2ccc..86ea33c6e2 100644 --- a/shell-completion/bash/systemctl +++ b/shell-completion/bash/systemctl @@ -146,7 +146,7 @@ _systemctl () { [TARGETS]='set-default' ) - for ((i=0; $i <= $COMP_CWORD; i++)); do + for ((i=0; i <= COMP_CWORD; i++)); do if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} && ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then verb=${COMP_WORDS[i]} @@ -154,7 +154,7 @@ _systemctl () { fi done - if [[ -z $verb ]]; then + if [[ -z $verb ]]; then comps="${VERBS[*]}" elif __contains_word "$verb" ${VERBS[ALL_UNITS]}; then diff --git a/shell-completion/bash/systemd-analyze b/shell-completion/bash/systemd-analyze index b65466ba47..98c793be99 100644 --- a/shell-completion/bash/systemd-analyze +++ b/shell-completion/bash/systemd-analyze @@ -39,7 +39,7 @@ _systemd_analyze() { _init_completion || return - for ((i=0; $i <= $COMP_CWORD; i++)); do + for ((i=0; i <= COMP_CWORD; i++)); do if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} && ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then verb=${COMP_WORDS[i]} diff --git a/shell-completion/zsh/_busctl b/shell-completion/zsh/_busctl new file mode 100644 index 0000000000..7c01564921 --- /dev/null +++ b/shell-completion/zsh/_busctl @@ -0,0 +1,54 @@ +#compdef busctl + +# hostnamectl(1) completion -*- shell-script -*- +# +# This file is part of systemd. +# +# Copyright 2013 Zbigniew Jędrzejewski-Szmek +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. +# +# systemd is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with systemd; If not, see <http://www.gnu.org/licenses/>. + +(( $+functions[_busctl_command] )) || _busctl_command() +{ + local -a _busctl_cmds + _busctl_cmds=( + "list:List bus names" + "monitor:Show bus traffic" + ) + if (( CURRENT == 1 )); then + _describe -t commands 'busctl command' _busctl_cmds || compadd "$@" + else + local curcontext="$curcontext" + cmd="${${_busctl_cmds[(r)$words[1]:*]%%:*}}" + if (( $+functions[_busctl_$cmd] )); then + _busctl_$cmd + else + _message "no more options" + fi + fi +} + +_arguments \ + {-h,--help}'[Prints a short help text and exits.]' \ + '--version[Prints a short version string and exits.]' \ + '--no-pager[Do not pipe output into a pager]' \ + '--system[Connect to system manager]' \ + '--user[Connect to user service manager]' \ + {-H+,--host=}'[Operate on remote host]:userathost:_sd_hosts_or_user_at_host' \ + {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \ + '--address=[Connect to the bus specified by address]:address' \ + '--no-unique[Only show well-known names]' \ + '--no-machine[Do not show machine IDs]' \ + '--match=[Only show matching messages]:match' \ + '*::busctl command:_busctl_command' diff --git a/src/libsystemd-bus/busctl.c b/src/libsystemd-bus/busctl.c index bcacfcee85..c855f936d6 100644 --- a/src/libsystemd-bus/busctl.c +++ b/src/libsystemd-bus/busctl.c @@ -283,6 +283,8 @@ static int help(void) { "Commands:\n" " list List bus names\n" " monitor [SERVICE...] Show bus traffic\n", + " status ENDPOINT Show endpoint status\n", + " help Show this help\n", program_invocation_short_name); return 0; |