summaryrefslogtreecommitdiff
path: root/themes/af-magic.zsh-theme
diff options
context:
space:
mode:
authorAndrew vonderLuft <avonderluft@avlux.net>2014-03-14 13:17:43 -0700
committerAndrew vonderLuft <avonderluft@avlux.net>2014-03-14 13:17:43 -0700
commitbf4d4db72b065bff57d75355f49192175364b8a5 (patch)
tree4ffa98f99c0919fda9418693d049a4bf7bf290f2 /themes/af-magic.zsh-theme
parent8f7971349b653706071bc41e2fdb953bb6f22678 (diff)
parentee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff)
downloadzsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.gz
zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.bz2
zsh-bf4d4db72b065bff57d75355f49192175364b8a5.zip
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
Diffstat (limited to 'themes/af-magic.zsh-theme')
-rw-r--r--themes/af-magic.zsh-theme15
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:"