Update powerline to show conda environments

pull/287/head
Travis Swicegood 2014-04-05 09:14:55 -05:00
parent 51416056b2
commit aeb08aea3f
1 changed files with 10 additions and 3 deletions

View File

@ -53,9 +53,16 @@ function powerline_shell_prompt {
} }
function powerline_virtualenv_prompt { function powerline_virtualenv_prompt {
if [[ -n "$VIRTUAL_ENV" ]]; then local environ=""
virtualenv=$(basename "$VIRTUAL_ENV")
VIRTUALENV_PROMPT="$(set_rgb_color ${LAST_THEME_COLOR} ${VIRTUALENV_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}$(set_rgb_color - ${VIRTUALENV_THEME_PROMPT_COLOR}) ${VIRTUALENV_CHAR}$virtualenv ${normal}" if [[ -n "$CONDA_DEFAULT_ENV" ]]; then
environ="conda: $CONDA_DEFAULT_ENV"
elif [[ -n "$VIRTUAL_ENV" ]]; then
environ=$(basename "$VIRTUAL_ENV")
fi
if [[ -n "$environ" ]]; then
VIRTUALENV_PROMPT="$(set_rgb_color ${LAST_THEME_COLOR} ${VIRTUALENV_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}$(set_rgb_color - ${VIRTUALENV_THEME_PROMPT_COLOR}) ${VIRTUALENV_CHAR}$environ ${normal}"
LAST_THEME_COLOR=${VIRTUALENV_THEME_PROMPT_COLOR} LAST_THEME_COLOR=${VIRTUALENV_THEME_PROMPT_COLOR}
else else
VIRTUALENV_PROMPT="" VIRTUALENV_PROMPT=""