diff options
| author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-14 10:32:03 -0400 |
|---|---|---|
| committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-14 10:32:03 -0400 |
| commit | 223fd60ba597b8c23569c65878d766c3c933fa70 (patch) | |
| tree | 33c5c6a150293e6cf81f26f0f1b9c733dcf8aab7 /themes/af-magic.zsh-theme | |
| parent | 185cb6e37352cc0d92042e35d259b0de3f5f3886 (diff) | |
| parent | ee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff) | |
| download | zsh-223fd60ba597b8c23569c65878d766c3c933fa70.tar.gz zsh-223fd60ba597b8c23569c65878d766c3c933fa70.tar.bz2 zsh-223fd60ba597b8c23569c65878d766c3c933fa70.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'themes/af-magic.zsh-theme')
| -rw-r--r-- | themes/af-magic.zsh-theme | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/themes/af-magic.zsh-theme b/themes/af-magic.zsh-theme index f241efb6a..97d142a0f 100644 --- a/themes/af-magic.zsh-theme +++ b/themes/af-magic.zsh-theme @@ -1,14 +1,6 @@ # af-magic.zsh-theme -# -# Author: Andy Fleming -# URL: http://andyfleming.com/ # Repo: https://github.com/andyfleming/oh-my-zsh # Direct Link: https://github.com/andyfleming/oh-my-zsh/blob/master/themes/af-magic.zsh-theme -# -# Created on: June 19, 2012 -# Last modified on: June 20, 2012 - - if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})" @@ -27,7 +19,12 @@ eval my_gray='$FG[237]' eval my_orange='$FG[214]' # right prompt -RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' +if type "virtualenv_prompt_info" > /dev/null +then + RPROMPT='$(virtualenv_prompt_info)$my_gray%n@%m%{$reset_color%}%' +else + RPROMPT='$my_gray%n@%m%{$reset_color%}%' +fi # git settings ZSH_THEME_GIT_PROMPT_PREFIX="$FG[075](branch:" |