diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2017-01-30 17:54:41 +0000 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2017-01-30 17:54:41 +0000 |
| commit | cd804aeb4ad40035e94a52fce4e720ddedfe139f (patch) | |
| tree | 4fd6e884a8d2d4d321346fe0f65bc27bb7f1e490 | |
| parent | b9f2df696dc575a175b2fbf4affdf5144c24c2f6 (diff) | |
| download | rabbitmq-server-git-cd804aeb4ad40035e94a52fce4e720ddedfe139f.tar.gz | |
Check for rabbitmqctl using `[ -x ]` and not `which` in autocompletion
| -rw-r--r-- | scripts/bash_autocomplete.sh | 12 | ||||
| -rw-r--r-- | scripts/rabbitmqctl-autocomplete.sh | 6 | ||||
| -rw-r--r-- | scripts/zsh_autocomplete.sh | 14 |
3 files changed, 17 insertions, 15 deletions
diff --git a/scripts/bash_autocomplete.sh b/scripts/bash_autocomplete.sh index 9452c7a832..a7b174c8bf 100644 --- a/scripts/bash_autocomplete.sh +++ b/scripts/bash_autocomplete.sh @@ -1,9 +1,11 @@ _rabbitmqctl_complete() { - COMPREPLY=() - local LANG=en_US.UTF-8 - local word="${COMP_WORDS[COMP_CWORD]}" - local completions="$(export LANG=en_US.UTF-8; export LC_CTYPE=en_US.UTF-8; /usr/lib/rabbitmq/bin/rabbitmqctl --auto-complete $COMP_LINE)" - COMPREPLY=( $(compgen -W "$completions" -- "$word") ) + if [ -x /usr/lib/rabbitmq/bin/rabbitmqctl ]; then + COMPREPLY=() + local LANG=en_US.UTF-8 + local word="${COMP_WORDS[COMP_CWORD]}" + local completions="$(export LANG=en_US.UTF-8; export LC_CTYPE=en_US.UTF-8; /usr/lib/rabbitmq/bin/rabbitmqctl --auto-complete $COMP_LINE)" + COMPREPLY=( $(compgen -W "$completions" -- "$word") ) + fi } complete -f -F _rabbitmqctl_complete rabbitmqctl diff --git a/scripts/rabbitmqctl-autocomplete.sh b/scripts/rabbitmqctl-autocomplete.sh index 1da60777b3..36b724cc59 100644 --- a/scripts/rabbitmqctl-autocomplete.sh +++ b/scripts/rabbitmqctl-autocomplete.sh @@ -1,5 +1,3 @@ -if which rabbitmqctl > /dev/null; then - if [ -n "$BASH_VERSION" ]; then - . /usr/lib/rabbitmq/autocomplete/bash_autocomplete.sh - fi +if [ -n "$BASH_VERSION" ]; then + . /usr/lib/rabbitmq/autocomplete/bash_autocomplete.sh fi
\ No newline at end of file diff --git a/scripts/zsh_autocomplete.sh b/scripts/zsh_autocomplete.sh index 898210b951..b027571379 100644 --- a/scripts/zsh_autocomplete.sh +++ b/scripts/zsh_autocomplete.sh @@ -1,10 +1,12 @@ _rabbitmqctl_complete() { - local word completions a - local LANG=en_US.UTF-8 - read -cl a - word="$1" - completions="$(export LANG=en_US.UTF-8; export LC_CTYPE=en_US.UTF-8; /usr/lib/rabbitmq/bin/rabbitmqctl --auto-complete ${=a})" - reply=( "${(ps:\n:)completions}" ) + if [ -x /usr/lib/rabbitmq/bin/rabbitmqctl ]; then + local word completions a + local LANG=en_US.UTF-8 + read -cl a + word="$1" + completions="$(export LANG=en_US.UTF-8; export LC_CTYPE=en_US.UTF-8; /usr/lib/rabbitmq/bin/rabbitmqctl --auto-complete ${=a})" + reply=( "${(ps:\n:)completions}" ) + fi } compctl -f -K _rabbitmqctl_complete rabbitmqctl |