diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2018-05-20 13:00:53 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2018-05-20 13:00:53 -0600 |
| commit | db38c7c3b2921783d955912262f87ee7dd8cd31b (patch) | |
| tree | 19711b0495e8472fdfb85643c2c7ec7c5a5229c3 /plugins/aws | |
| parent | 1481f7aa67df42bdf45953231637194ac200d240 (diff) | |
| parent | a600ab4b8578ca0a8e6c6dae0373033b9d8c201c (diff) | |
| download | zsh-db38c7c3b2921783d955912262f87ee7dd8cd31b.tar.gz zsh-db38c7c3b2921783d955912262f87ee7dd8cd31b.tar.bz2 zsh-db38c7c3b2921783d955912262f87ee7dd8cd31b.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/aws')
| -rw-r--r-- | plugins/aws/aws.plugin.zsh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh index 6a0e04add..183b0f226 100644 --- a/plugins/aws/aws.plugin.zsh +++ b/plugins/aws/aws.plugin.zsh @@ -37,16 +37,15 @@ function asp { } function aws_profiles { - reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/')) + reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_\.-]*\).*/\1/')) } - compctl -K aws_profiles asp -if _homebrew-installed && _awscli-homebrew-installed ; then +if which aws_zsh_completer.sh &>/dev/null; then + _aws_zsh_completer_path=$(which aws_zsh_completer.sh 2>/dev/null) +elif _homebrew-installed && _awscli-homebrew-installed; then _aws_zsh_completer_path=$_brew_prefix/libexec/bin/aws_zsh_completer.sh -else - _aws_zsh_completer_path=$(which aws_zsh_completer.sh) fi -[ -x $_aws_zsh_completer_path ] && source $_aws_zsh_completer_path +[ -n "$_aws_zsh_completer_path" ] && [ -x $_aws_zsh_completer_path ] && source $_aws_zsh_completer_path unset _aws_zsh_completer_path |