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

Virtualenvwrapper plugin now use git_get_root

Browse source 
- it will fix #1180 (since we don't use `readlink`)
- unset some variables used only by plugin
- `workon_cwd` is private function, so it was prefixed with '_'
- indentation
This commit is contained in:
Pavel Puchkin 2012-06-22 21:23:42 +11:00
commit e950d0bb2f
1 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,33 +8,32 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/
# Automatically activate Git projects' virtual environments based on the # Automatically activate Git projects' virtual environments based on the
# directory name of the project. Virtual environment name can be overridden # directory name of the project. Virtual environment name can be overridden
# by placing a .venv file in the project root with a virtualenv name in it # by placing a .venv file in the project root with a virtualenv name in it
function workon_cwd { function _workon_cwd {
# Check that this is a Git repo # Check that this is a Git repo and get its root
GIT_DIR=`git rev-parse --git-dir 2> /dev/null` REPO_ROOT=`git_get_root`
if (( $? == 0 )); then if [[ -n "$REPO_ROOT" ]]; then
# Find the repo root and check for virtualenv name override ENV_NAME=`basename "$REPO_ROOT"`
GIT_DIR=`readlink -f $GIT_DIR` if [[ -f "$REPO_ROOT/.venv" ]]; then
PROJECT_ROOT=`dirname "$GIT_DIR"` ENV_NAME=`cat "$REPO_ROOT/.venv"`
ENV_NAME=`basename "$PROJECT_ROOT"`
if [[ -f "$PROJECT_ROOT/.venv" ]]; then
ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
fi
# Activate the environment only if it is not already active
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"
fi
fi
elif [ $CD_VIRTUAL_ENV ]; then
# We've just left the repo, deactivate the environment
# Note: this only happens if the virtualenv was activated automatically
deactivate && unset CD_VIRTUAL_ENV
fi fi
# Activate the environment only if it is not already active
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"
fi
fi
elif [ $CD_VIRTUAL_ENV ]; then
# We've just left the repo, deactivate the environment
# Note: this only happens if the virtualenv was activated automatically
deactivate && unset CD_VIRTUAL_ENV
fi
unset REPO_ROOT
unset ENV_NAME
} }
# 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
} }
fi fi
@ -45,3 +44,5 @@ done
if [ $WRAPPER_FOUND -eq 0 ] ; then if [ $WRAPPER_FOUND -eq 0 ] ; then
print "zsh virtualenvwrapper plugin: Couldn't activate virtualenvwrapper. Please run \`pip install virtualenvwrapper\`." print "zsh virtualenvwrapper plugin: Couldn't activate virtualenvwrapper. Please run \`pip install virtualenvwrapper\`."
fi fi
unset WRAPPER_FOUND