diff options
| author | Peter Tillemans <pti@snamellit.com> | 2013-01-02 09:42:14 +0100 |
|---|---|---|
| committer | Peter Tillemans <pti@snamellit.com> | 2013-01-02 09:42:14 +0100 |
| commit | 587832f15579398e54690e62ea588178e951f8f8 (patch) | |
| tree | 1e2149e743710e2c72a567a042606333bbad88da /themes/frisk.zsh-theme | |
| parent | 55cc936d4e6d88f18518cedc9574b1df10702f8b (diff) | |
| parent | 80a603259657acab97badbae20003b5a34c901f9 (diff) | |
| download | zsh-587832f15579398e54690e62ea588178e951f8f8.tar.gz zsh-587832f15579398e54690e62ea588178e951f8f8.tar.bz2 zsh-587832f15579398e54690e62ea588178e951f8f8.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'themes/frisk.zsh-theme')
| -rw-r--r-- | themes/frisk.zsh-theme | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/themes/frisk.zsh-theme b/themes/frisk.zsh-theme index f181aec90..2c999a6a6 100644 --- a/themes/frisk.zsh-theme +++ b/themes/frisk.zsh-theme @@ -1,10 +1,22 @@ PROMPT=$' -%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%} +%{$fg[blue]%}%/%{$reset_color%} $(git_prompt_info)$(bzr_prompt_info)%{$fg[white]%}[%n@%m]%{$reset_color%} %{$fg[white]%}[%T]%{$reset_color%} %{$fg_bold[black]%}>%{$reset_color%} ' PROMPT2="%{$fg_blod[black]%}%_> %{$reset_color%}" -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[green]%}[" +GIT_CB="git::" +ZSH_THEME_SCM_PROMPT_PREFIX="%{$fg[green]%}[" +ZSH_THEME_GIT_PROMPT_PREFIX=$ZSH_THEME_SCM_PROMPT_PREFIX$GIT_CB ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%} " ZSH_THEME_GIT_PROMPT_DIRTY=" %{$fg[red]%}*%{$fg[green]%}" ZSH_THEME_GIT_PROMPT_CLEAN="" + +## Bazaar integration +bzr_prompt_info() { + BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'` + if [ -n "$BZR_CB" ]; then + BZR_DIRTY="" + [[ -n `bzr status` ]] && BZR_DIRTY="%{$fg[red]%} *%{$reset_color%}" + echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX" + fi +} |