linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-01-02 02:19:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfix - plugin wont deactivate venv in some cases

Browse source 
...when changing directory directly from git repo to another repo, which
have not associated virtualenv
This commit is contained in:
Pavel Puchkin 2012-06-22 23:32:29 +11:00
commit 1684a2319a
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
View file

@ -20,17 +20,25 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME" workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
else
_deactivate
fi fi
fi fi
elif [ $CD_VIRTUAL_ENV ]; then else
# We've just left the repo, deactivate the environment # We've just left the repo, deactivate the environment
# Note: this only happens if the virtualenv was activated automatically # Note: this only happens if the virtualenv was activated automatically
deactivate && unset CD_VIRTUAL_ENV _deactivate
fi fi
unset REPO_ROOT unset REPO_ROOT
unset ENV_NAME unset ENV_NAME
} }
function _deactivate() {
if [[ -n $CD_VIRTUAL_ENV ]]; then
deactivate && unset CD_VIRTUAL_ENV
fi
}
# New cd function that does the virtualenv magic # New cd function that does the virtualenv magic
function cd { function cd {
builtin cd "$@" && _workon_cwd builtin cd "$@" && _workon_cwd