From 2f884811bbf0433d53be9b56a09ef942b4bc0553 Mon Sep 17 00:00:00 2001
From: Benjamin Rosas <ben.rosas@govdelivery.com>
Date: Mon, 20 Oct 2014 09:41:16 -0500
Subject: [PATCH] [#3238] swapping out %~ for %1/ in a few themes to fix
 rvm_project_path issue

---
 themes/3den.zsh-theme        | 2 +-
 themes/Soliah.zsh-theme      | 2 +-
 themes/alanpeabody.zsh-theme | 2 +-
 themes/aussiegeek.zsh-theme  | 2 +-
 themes/bira.zsh-theme        | 2 +-
 themes/eastwood.zsh-theme    | 2 +-
 themes/gallois.zsh-theme     | 2 +-
 themes/gnzh.zsh-theme        | 2 +-
 themes/itchy.zsh-theme       | 2 +-
 themes/murilasso.zsh-theme   | 2 +-
 themes/nebirhos.zsh-theme    | 2 +-
 themes/peepcode.zsh-theme    | 2 +-
 themes/superjarin.zsh-theme  | 2 +-
 themes/wedisagree.zsh-theme  | 2 +-
 themes/wuffers.zsh-theme     | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/themes/3den.zsh-theme b/themes/3den.zsh-theme
index 1d2c7db7f..e0f267c14 100644
--- a/themes/3den.zsh-theme
+++ b/themes/3den.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT=$'%{$fg[white]%}$(~/.rvm/bin/rvm-prompt) %{$fg_bold[cyan]%}%~%{$reset_color%}$(git_prompt_info) %{$fg[cyan]%}%D{[%I:%M:%S]}\
+PROMPT=$'%{$fg[white]%}$(~/.rvm/bin/rvm-prompt) %{$fg_bold[cyan]%}%1/%{$reset_color%}$(git_prompt_info) %{$fg[cyan]%}%D{[%I:%M:%S]}\
 %{$fg_bold[green]%}%n$%{$reset_color%} '
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[white]%}("
diff --git a/themes/Soliah.zsh-theme b/themes/Soliah.zsh-theme
index 070c54981..950997034 100644
--- a/themes/Soliah.zsh-theme
+++ b/themes/Soliah.zsh-theme
@@ -1,4 +1,4 @@
-PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%~%b%{$reset_color%}$(git_time_since_commit)$(check_git_prompt_info)
+PROMPT='%{$fg[blue]%}%n%{$reset_color%} on %{$fg[red]%}%M%{$reset_color%} in %{$fg[blue]%}%1/%{$reset_color%}$(git_time_since_commit)$(check_git_prompt_info)
 $ '
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
diff --git a/themes/alanpeabody.zsh-theme b/themes/alanpeabody.zsh-theme
index 4a1b1b386..cab1364dc 100644
--- a/themes/alanpeabody.zsh-theme
+++ b/themes/alanpeabody.zsh-theme
@@ -1,6 +1,6 @@
 
 local user='%{$fg[magenta]%}%n@%{$fg[magenta]%}%m%{$reset_color%}'
-local pwd='%{$fg[blue]%}%~%{$reset_color%}'
+local pwd='%{$fg[blue]%}%1/%{$reset_color%}'
 local rvm=''
 if which rvm-prompt &> /dev/null; then
   rvm='%{$fg[green]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
diff --git a/themes/aussiegeek.zsh-theme b/themes/aussiegeek.zsh-theme
index c2c7f65b9..b26e9e1eb 100644
--- a/themes/aussiegeek.zsh-theme
+++ b/themes/aussiegeek.zsh-theme
@@ -1,5 +1,5 @@
 
-PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color
+PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%1/$(git_prompt_info)$fg[yellow]$(rvm_prompt_info)$fg_bold[blue] ]$reset_color
  $ '
 # git theming
 ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green]("
diff --git a/themes/bira.zsh-theme b/themes/bira.zsh-theme
index 215720477..2609ad5a0 100644
--- a/themes/bira.zsh-theme
+++ b/themes/bira.zsh-theme
@@ -2,7 +2,7 @@
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
-local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}'
+local current_dir='%{$terminfo[bold]$fg[blue]%} %1/%{$reset_color%}'
 local rvm_ruby=''
 if which rvm-prompt &> /dev/null; then
   rvm_ruby='%{$fg[red]%}‹$(rvm-prompt i v g)›%{$reset_color%}'
diff --git a/themes/eastwood.zsh-theme b/themes/eastwood.zsh-theme
index 1b284cdc2..444a218c0 100644
--- a/themes/eastwood.zsh-theme
+++ b/themes/eastwood.zsh-theme
@@ -20,4 +20,4 @@ git_custom_status() {
   fi
 }
 
-PROMPT='$(git_custom_status)%{$fg[cyan]%}[%~% ]%{$reset_color%}%B$%b '
+PROMPT='$(git_custom_status)%{$fg[cyan]%}[%1/% ]%{$reset_color%}%B$%b '
diff --git a/themes/gallois.zsh-theme b/themes/gallois.zsh-theme
index f1057a9a9..e83045a92 100644
--- a/themes/gallois.zsh-theme
+++ b/themes/gallois.zsh-theme
@@ -26,4 +26,4 @@ else
   fi
 fi
 
-PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
+PROMPT='%{$fg[cyan]%}[%1/% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
diff --git a/themes/gnzh.zsh-theme b/themes/gnzh.zsh-theme
index 0519fbefb..8b531b6a0 100644
--- a/themes/gnzh.zsh-theme
+++ b/themes/gnzh.zsh-theme
@@ -34,7 +34,7 @@ fi
 local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
 
 local user_host='${PR_USER}${PR_CYAN}@${PR_HOST}'
-local current_dir='%{$PR_BOLD$PR_BLUE%}%~%{$PR_NO_COLOR%}'
+local current_dir='%{$PR_BOLD$PR_BLUE%}%1/%{$PR_NO_COLOR%}'
 local rvm_ruby=''
 if ${HOME}/.rvm/bin/rvm-prompt &> /dev/null; then # detect local user rvm installation
   rvm_ruby='%{$PR_RED%}‹$(${HOME}/.rvm/bin/rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
diff --git a/themes/itchy.zsh-theme b/themes/itchy.zsh-theme
index c23889edf..964ded15b 100644
--- a/themes/itchy.zsh-theme
+++ b/themes/itchy.zsh-theme
@@ -4,7 +4,7 @@ local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_colo
 
 local user="%{$fg[cyan]%}%n%{$reset_color%}"
 local host="%{$fg[cyan]%}@%m%{$reset_color%}"
-local pwd="%{$fg[yellow]%}%~%{$reset_color%}"
+local pwd="%{$fg[yellow]%}%1/%{$reset_color%}"
 
 PROMPT='${user}${host} ${pwd}
 ${smiley}  '
diff --git a/themes/murilasso.zsh-theme b/themes/murilasso.zsh-theme
index bc2b9b224..565c29b2c 100644
--- a/themes/murilasso.zsh-theme
+++ b/themes/murilasso.zsh-theme
@@ -1,6 +1,6 @@
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
-local current_dir='%{$terminfo[bold]$fg[blue]%}%~%{$reset_color%}'
+local current_dir='%{$terminfo[bold]$fg[blue]%}%1/%{$reset_color%}'
 local rvm_ruby='%{$fg[red]%}$(rvm_prompt_info || rbenv_prompt_info)%{$reset_color%}'
 local git_branch='%{$fg[blue]%}$(git_prompt_info)%{$reset_color%}'
 
diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme
index a5a226b69..3c222a6b8 100644
--- a/themes/nebirhos.zsh-theme
+++ b/themes/nebirhos.zsh-theme
@@ -11,7 +11,7 @@ else
 fi
 
 # Get the host name (first 4 chars)
-HOST_PROMPT_="%{$fg_bold[red]%}@$HOST[0,4] ➜  %{$fg_bold[cyan]%}%c "
+HOST_PROMPT_="%{$fg_bold[red]%}@$HOST[0,4] ➜  %{$fg_bold[cyan]%}%1/ "
 GIT_PROMPT="%{$fg_bold[blue]%}\$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}"
 PROMPT="$HOST_PROMPT_$RUBY_PROMPT_$GIT_PROMPT"
 
diff --git a/themes/peepcode.zsh-theme b/themes/peepcode.zsh-theme
index ca2a8862f..47f67f0b0 100644
--- a/themes/peepcode.zsh-theme
+++ b/themes/peepcode.zsh-theme
@@ -38,7 +38,7 @@ git_prompt() {
 local smiley="%(?,%{$fg[green]%}☺%{$reset_color%},%{$fg[red]%}☹%{$reset_color%})"
 
 PROMPT='
-%~
+%1/
 ${smiley}  %{$reset_color%}'
 
 RPROMPT='%{$fg[white]%} $(~/.rvm/bin/rvm-prompt)$(git_prompt)%{$reset_color%}'
diff --git a/themes/superjarin.zsh-theme b/themes/superjarin.zsh-theme
index 2920d17a2..605825e13 100644
--- a/themes/superjarin.zsh-theme
+++ b/themes/superjarin.zsh-theme
@@ -9,7 +9,7 @@ fi
 
 # Grab the current filepath, use shortcuts: ~/Desktop
 # Append the current git branch, if in a git repository
-JARIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%~\$(git_prompt_info)%{$reset_color%}"
+JARIN_CURRENT_LOCA_="%{$fg_bold[cyan]%}%1/\$(git_prompt_info)%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%} <%{$fg[magenta]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[white]%}"
 
diff --git a/themes/wedisagree.zsh-theme b/themes/wedisagree.zsh-theme
index 9bdbce40d..88b9839c0 100644
--- a/themes/wedisagree.zsh-theme
+++ b/themes/wedisagree.zsh-theme
@@ -21,7 +21,7 @@
 
 # The prompt
 
-PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
+PROMPT='%{$fg[magenta]%}[%1/] %{$reset_color%}'
 
 # The right-hand prompt
 
diff --git a/themes/wuffers.zsh-theme b/themes/wuffers.zsh-theme
index 4019d0a51..1a15b6ff3 100644
--- a/themes/wuffers.zsh-theme
+++ b/themes/wuffers.zsh-theme
@@ -2,4 +2,4 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
 ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} "
 ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg_bold[red]%} x%{$fg_bold[blue]%}"
 
-PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current 2>/dev/null || rbenv version-name 2>/dev/null)%}}%{$reset_color%} %{$fg[cyan]%}%c%{$reset_color%} '
+PROMPT='%{$(git_prompt_info)%}%{$fg_bold[green]%}{%{$(rvm current 2>/dev/null || rbenv version-name 2>/dev/null)%}}%{$reset_color%} %{$fg[cyan]%}%1/%{$reset_color%} '