diff options
| author | Carlo Sala <carlosalag@protonmail.com> | 2023-03-21 15:29:48 +0100 |
|---|---|---|
| committer | Carlo Sala <carlosalag@protonmail.com> | 2023-03-21 16:06:45 +0100 |
| commit | f9f01e48a890ad4359a6973d1b8a7039f57b2d08 (patch) | |
| tree | a6b9334f87f6a7b8b6360e5927112c4bd64e56fb /plugins | |
| parent | 4a39779067eda369152bfd6b653f843286c930c0 (diff) | |
| download | zsh-f9f01e48a890ad4359a6973d1b8a7039f57b2d08.tar.gz zsh-f9f01e48a890ad4359a6973d1b8a7039f57b2d08.tar.bz2 zsh-f9f01e48a890ad4359a6973d1b8a7039f57b2d08.zip | |
fix(aws): do not print region if it's not defined
Closes #11568
Closes #11570
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/aws/aws.plugin.zsh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh index 39c47d572..0242be97e 100644 --- a/plugins/aws/aws.plugin.zsh +++ b/plugins/aws/aws.plugin.zsh @@ -196,9 +196,15 @@ compctl -K _aws_profiles asp acp aws_change_access_key # AWS prompt function aws_prompt_info() { - if [[ -z $AWS_REGION && -z $AWS_PROFILE ]];then return; fi - region=${AWS_REGION:-${AWS_DEFAULT_REGION:-$AWS_PROFILE_REGION}} - echo "${ZSH_THEME_AWS_PROFILE_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_PROFILE_SUFFIX:=>} ${ZSH_THEME_AWS_REGION_PREFIX:=<region:}${region}${ZSH_THEME_AWS_REGION_SUFFIX:=>}" + local _aws_to_show + if [[ -n $AWS_PROFILE ]];then + _aws_to_show+="${ZSH_THEME_AWS_PROFILE_PREFIX:=<aws:}${AWS_PROFILE}${ZSH_THEME_AWS_PROFILE_SUFFIX:=>}" + fi + if [[ -n $AWS_REGION ]]; then + [[ -n $AWS_PROFILE ]] && _aws_to_show+=" " + _aws_to_show+="${ZSH_THEME_AWS_REGION_PREFIX:=<region:}${region}${ZSH_THEME_AWS_REGION_SUFFIX:=>}" + fi + echo "$_aws_to_show" } if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then |