From 53d6a692d14a035d03765e72c7c9425bba1b3972 Mon Sep 17 00:00:00 2001
From: programmer04 <jakub.warczarek@gmail.com>
Date: Mon, 8 Apr 2019 22:08:37 +0200
Subject: [PATCH 1/3] Fix showing aws prompt for theme fishy (append RPROMPT
 instead of overwrite)

---
 plugins/aws/README.md  | 2 +-
 themes/fishy.zsh-theme | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index a52024128..d83c3fafe 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -24,7 +24,7 @@ plugins=(... aws)
 
 ## 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 plugins overwrite the value of RPROMPT instead of appending to it, so they need to be fixed to see a default aws plugin RPROMPT message (for example theme fishy is fixed).
 
 ## Theme
 
diff --git a/themes/fishy.zsh-theme b/themes/fishy.zsh-theme
index 83bd455b5..00a60f45b 100644
--- a/themes/fishy.zsh-theme
+++ b/themes/fishy.zsh-theme
@@ -14,7 +14,7 @@ PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>)
 PROMPT2='%{$fg[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_SUFFIX=""

From 63291f4fcc07de3014362ef5101132d91ad3d497 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 9 Apr 2019 18:24:04 +0200
Subject: [PATCH 2/3] Reword and fix formatting

---
 plugins/aws/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/aws/README.md b/plugins/aws/README.md
index d83c3fafe..57c3b54ac 100644
--- a/plugins/aws/README.md
+++ b/plugins/aws/README.md
@@ -24,7 +24,9 @@ plugins=(... aws)
 
 ## Plugin options
 
-* Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT. Some plugins overwrite the value of RPROMPT instead of appending to it, so they need to be fixed to see a default aws plugin RPROMPT message (for example theme fishy is fixed).
+* 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
 

From 5f9cc016d7fb19004529ea935d6a386846ad46e2 Mon Sep 17 00:00:00 2001
From: programmer04 <jakub.warczarek@gmail.com>
Date: Tue, 9 Apr 2019 21:07:42 +0200
Subject: [PATCH 3/3] Fix redundant export of RPROMPT in aws plugin

---
 plugins/aws/aws.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh
index 6de329bb8..0895cfb3a 100644
--- a/plugins/aws/aws.plugin.zsh
+++ b/plugins/aws/aws.plugin.zsh
@@ -44,7 +44,7 @@ function aws_prompt_info() {
 }
 
 if [ "$SHOW_AWS_PROMPT" != false ]; then
-  export RPROMPT='$(aws_prompt_info)'"$RPROMPT"
+  RPROMPT='$(aws_prompt_info)'"$RPROMPT"
 fi