diff options
| author | Peter Tillemans <pti@snamellit.com> | 2012-06-26 11:13:45 +0200 |
|---|---|---|
| committer | Peter Tillemans <pti@snamellit.com> | 2012-06-26 11:13:45 +0200 |
| commit | cc98254b62658a988dd8cee0d5e1cb4172b6a064 (patch) | |
| tree | 866278c55e2e22eb7ef4f48c5ba3787898b38bd1 /plugins/virtualenvwrapper | |
| parent | 8b69c7f6a0c80c1c53505e17d356387b83e18efc (diff) | |
| parent | d165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff) | |
| download | zsh-cc98254b62658a988dd8cee0d5e1cb4172b6a064.tar.gz zsh-cc98254b62658a988dd8cee0d5e1cb4172b6a064.tar.bz2 zsh-cc98254b62658a988dd8cee0d5e1cb4172b6a064.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/virtualenvwrapper')
| -rw-r--r-- | plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index afdad1bea..a93c8e863 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -10,11 +10,9 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/ # by placing a .venv file in the project root with a virtualenv name in it function workon_cwd { # Check that this is a Git repo - GIT_DIR=`git rev-parse --git-dir 2> /dev/null` + PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` if (( $? == 0 )); then - # Find the repo root and check for virtualenv name override - GIT_DIR=`readlink -f $GIT_DIR` - PROJECT_ROOT=`dirname "$GIT_DIR"` + # Check for virtualenv name override ENV_NAME=`basename "$PROJECT_ROOT"` if [[ -f "$PROJECT_ROOT/.venv" ]]; then ENV_NAME=`cat "$PROJECT_ROOT/.venv"` @@ -30,6 +28,7 @@ for wrapsource in "/usr/local/bin/virtualenvwrapper.sh" "/etc/bash_completion.d/ # Note: this only happens if the virtualenv was activated automatically deactivate && unset CD_VIRTUAL_ENV fi + unset PROJECT_ROOT } # New cd function that does the virtualenv magic |