Merge pull request #57 from gabraganca/conda

Adds support to show Conda environment on prompt

gitprompt.sh

@@ -134,6 +134,8 @@ function git_prompt_config()
   else
     if [[ -n "${VIRTUAL_ENV}" ]]; then
       EMPTY_PROMPT="(${Blue}$(basename "${VIRTUAL_ENV}")${ResetColor}) ${PROMPT_START}$($prompt_callback)${PROMPT_END}"
+    elif [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+      EMPTY_PROMPT="(${Blue}$(basename "${CONDA_DEFAULT_ENV}")${ResetColor}) ${PROMPT_START}$($prompt_callback)${PROMPT_END}"
     else
       EMPTY_PROMPT="${PROMPT_START}$($prompt_callback)${PROMPT_END}"
     fi
@@ -268,6 +270,10 @@ function updatePrompt() {
       PS1="(${Blue}$(basename ${VIRTUAL_ENV})${ResetColor}) ${PS1}"
     fi
 
+    if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
+      PS1="(${Blue}$(basename ${CONDA_DEFAULT_ENV})${ResetColor}) ${PS1}"
+    fi
+
   else
     PS1="${EMPTY_PROMPT}"
   fi
@@ -310,4 +316,4 @@ function run {
   source "$__GIT_PROMPT_DIR/git-prompt-help.sh"
 }
 
-run
+run