diff options
| author | Alexander Berezovsky <ab@plumdistrict.com> | 2012-06-28 13:37:00 -0700 |
|---|---|---|
| committer | Alexander Berezovsky <ab@plumdistrict.com> | 2012-06-28 13:37:00 -0700 |
| commit | 34f3d4d4988a8a8f7b5a109f2041923b1f7317e5 (patch) | |
| tree | d5e5fe1d15dca13a270de99fa21406192beb4a87 /plugins/virtualenvwrapper | |
| parent | 4a2e9ed0393b74a4e4b42766a5859e6634ce4c65 (diff) | |
| parent | d165a84dc0e8d2eb0774ed26995e7046c0aff41f (diff) | |
| download | zsh-34f3d4d4988a8a8f7b5a109f2041923b1f7317e5.tar.gz zsh-34f3d4d4988a8a8f7b5a109f2041923b1f7317e5.tar.bz2 zsh-34f3d4d4988a8a8f7b5a109f2041923b1f7317e5.zip | |
Merge branch 'master' of git://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 |