diff options
| author | Robby Russell <robby@planetargon.com> | 2013-12-03 00:19:21 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-12-03 00:19:21 -0800 |
| commit | 032ca0d67c9af853dab73396ad3e05a28ce85686 (patch) | |
| tree | f25bd6bac41b41a224a0cfd305ad16cbed485240 /plugins/virtualenvwrapper | |
| parent | 7d1b668f41e617d8ca4b5ef399d5639a08dc6edd (diff) | |
| parent | c0c9fc02543eb14de49b0416e3df1100845633d8 (diff) | |
| download | zsh-032ca0d67c9af853dab73396ad3e05a28ce85686.tar.gz zsh-032ca0d67c9af853dab73396ad3e05a28ce85686.tar.bz2 zsh-032ca0d67c9af853dab73396ad3e05a28ce85686.zip | |
Merge pull request #2173 from jeffrey4l/venv
Add support .venv folder as virtual env
Diffstat (limited to 'plugins/virtualenvwrapper')
| -rw-r--r-- | plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 670c287bd..16f32da6e 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -17,6 +17,8 @@ if (( $+commands[$virtualenvwrapper] )); then # Check for virtualenv name override if [[ -f "$PROJECT_ROOT/.venv" ]]; then ENV_NAME=`cat "$PROJECT_ROOT/.venv"` + elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then + ENV_NAME="$PROJECT_ROOT/.venv" elif [[ "$PROJECT_ROOT" != "." ]]; then ENV_NAME=`basename "$PROJECT_ROOT"` else @@ -27,6 +29,8 @@ if (( $+commands[$virtualenvwrapper] )); then if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" + elif [[ -e "$ENV_NAME/bin/activate" ]]; then + source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME" fi fi elif [ $CD_VIRTUAL_ENV ]; then |