diff options
| author | Peter Tillemans <pti@snamellit.com> | 2012-06-26 11:13:45 +0200 |
|---|---|---|
| committer | Peter Tillemans <pti@snamellit.com> | 2012-06-26 11:13:45 +0200 |
| commit | cc98254b62658a988dd8cee0d5e1cb4172b6a064 (patch) | |
| tree | 866278c55e2e22eb7ef4f48c5ba3787898b38bd1 /themes | |
| parent | 8b69c7f6a0c80c1c53505e17d356387b83e18efc (diff) | |
| parent | d165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff) | |
| download | zsh-cc98254b62658a988dd8cee0d5e1cb4172b6a064.tar.gz zsh-cc98254b62658a988dd8cee0d5e1cb4172b6a064.tar.bz2 zsh-cc98254b62658a988dd8cee0d5e1cb4172b6a064.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'themes')
| -rw-r--r-- | themes/nebirhos.zsh-theme | 2 | ||||
| -rw-r--r-- | themes/steeef.zsh-theme | 2 |
2 files changed, 2 insertions, 2 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 |