diff options
| author | Lei Zhang <zhang.lei.fly@gmail.com> | 2013-10-16 15:44:49 +0800 |
|---|---|---|
| committer | Lei Zhang <zhang.lei.fly@gmail.com> | 2013-10-16 15:50:52 +0800 |
| commit | c0c9fc02543eb14de49b0416e3df1100845633d8 (patch) | |
| tree | c8237f398a68abf48dc12100dc0ee5b12da577bb /plugins/virtualenvwrapper | |
| parent | c79e5a97a906457d1778197bd4f29640d1917201 (diff) | |
| download | zsh-c0c9fc02543eb14de49b0416e3df1100845633d8.tar.gz zsh-c0c9fc02543eb14de49b0416e3df1100845633d8.tar.bz2 zsh-c0c9fc02543eb14de49b0416e3df1100845633d8.zip | |
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 |