upstream/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-20 15:55:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix showing aws prompt out of the box for 'fishy' theme (#7747)

Browse Source 
This fixes the RPROMPT setting for fishy theme so as to preserve its old value,
instead of overwriting it like it did before.

Also, fix unnecessary export of RPROMPT in aws plugin.
This commit is contained in:
Marc Cornellà 2019-04-09 22:20:00 +02:00 committed by GitHub
commit 0c3499ecd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/aws/README.md
View File

@ -25,6 +25,8 @@ plugins=(... aws)
## Plugin options ## Plugin options
* Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT. * Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT.
Some themes might overwrite the value of RPROMPT instead of appending to it, so they'll need to be fixed to
see the AWS profile prompt.
## Theme ## Theme

2
plugins/aws/aws.plugin.zsh
View File

@ -44,7 +44,7 @@ function aws_prompt_info() {
} }
if [ "$SHOW_AWS_PROMPT" != false ]; then if [ "$SHOW_AWS_PROMPT" != false ]; then
export RPROMPT='$(aws_prompt_info)'"$RPROMPT" RPROMPT='$(aws_prompt_info)'"$RPROMPT"
fi fi

2
themes/fishy.zsh-theme
View File

@ -14,7 +14,7 @@ PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>)
PROMPT2='%{$fg[red]%}\ %{$reset_color%}' PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}" local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
RPROMPT='${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}' RPROMPT="${RPROMPT}"'${return_status}$(git_prompt_info)$(git_prompt_status)%{$reset_color%}'
ZSH_THEME_GIT_PROMPT_PREFIX=" " ZSH_THEME_GIT_PROMPT_PREFIX=" "
ZSH_THEME_GIT_PROMPT_SUFFIX="" ZSH_THEME_GIT_PROMPT_SUFFIX=""