Merge pull request #281 from jbarbuto/use_relative_symlinks
Use relative symlinks when enabling plugins
diff --git a/completion/available/conda.completion.bash b/completion/available/conda.completion.bash
new file mode 100644
index 0000000..cb5a15d
--- /dev/null
+++ b/completion/available/conda.completion.bash
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+which register-python-argcomplete > /dev/null \
+ && eval "$(register-python-argcomplete conda)" \
+ || echo "Please install argcomplete to use conda completion"
diff --git a/themes/powerline/powerline.theme.bash b/themes/powerline/powerline.theme.bash
index 81598de..012f933 100644
--- a/themes/powerline/powerline.theme.bash
+++ b/themes/powerline/powerline.theme.bash
@@ -53,9 +53,16 @@
}
function powerline_virtualenv_prompt {
- if [[ -n "$VIRTUAL_ENV" ]]; then
- 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}"
+ local environ=""
+
+ 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}
else
VIRTUALENV_PROMPT=""