diff options
| author | Sébastien <seb@Macbook.local> | 2012-06-25 17:41:06 +0200 |
|---|---|---|
| committer | Sébastien <seb@Macbook.local> | 2012-06-25 17:41:06 +0200 |
| commit | 29fb24487cce4e61bdc24a9a0308f04a739a3d1f (patch) | |
| tree | 7ef05913a12a6f67cd095dac9161e663035e53e2 /themes | |
| parent | 579f33d489c8b61e77279894cd467c3207955c09 (diff) | |
| parent | d165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff) | |
| download | zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.gz zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.tar.bz2 zsh-29fb24487cce4e61bdc24a9a0308f04a739a3d1f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/nebirhos.zsh-theme | 2 | ||||
| -rw-r--r-- | themes/steeef.zsh-theme | 2 | ||||
| -rw-r--r-- | themes/terminalparty.zsh-theme | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/themes/nebirhos.zsh-theme b/themes/nebirhos.zsh-theme index c5864d9b8..a5a226b69 100644 --- a/themes/nebirhos.zsh-theme +++ b/themes/nebirhos.zsh-theme @@ -6,7 +6,7 @@ if [ -e ~/.rvm/bin/rvm-prompt ]; then RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(~/.rvm/bin/rvm-prompt s i v g)%{$fg_bold[blue]%})%{$reset_color%} " else if which rbenv &> /dev/null; then - RUBY_PROMPT_="%{$fg_bold[blue]%}rvm:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} " + RUBY_PROMPT_="%{$fg_bold[blue]%}rbenv:(%{$fg[green]%}\$(rbenv version | sed -e 's/ (set.*$//')%{$fg_bold[blue]%})%{$reset_color%} " fi fi diff --git a/themes/steeef.zsh-theme b/themes/steeef.zsh-theme index a2583b028..312229e9f 100644 --- a/themes/steeef.zsh-theme +++ b/themes/steeef.zsh-theme @@ -81,7 +81,7 @@ add-zsh-hook chpwd steeef_chpwd function steeef_precmd { if [[ -n "$PR_GIT_UPDATE" ]] ; then # check for untracked files or updated submodules, since vcs_info doesn't - if [[ ! -z $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then + if git ls-files --other --exclude-standard --directory 2> /dev/null | grep -q "."; then PR_GIT_UPDATE=1 FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})" else diff --git a/themes/terminalparty.zsh-theme b/themes/terminalparty.zsh-theme index 73653aca8..216ce37eb 100644 --- a/themes/terminalparty.zsh-theme +++ b/themes/terminalparty.zsh-theme @@ -2,7 +2,7 @@ PROMPT='%{$fg[green]%} %% ' # RPS1='%{$fg[blue]%}%~%{$reset_color%} ' RPS1='%{$fg[white]%}%2~$(git_prompt_info) %{$fg_bold[blue]%}%m%{$reset_color%}' -ZSH_THEME_GIT_PROMPT_PREFIX=" (%{$fg[yellow]%}" +ZSH_THEME_GIT_PROMPT_PREFIX=" %{$fg[yellow]%}(" ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}" ZSH_THEME_GIT_PROMPT_CLEAN="" ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%} ⚡%{$fg[yellow]%}" |