diff options
| author | Robby Russell <robby@planetargon.com> | 2012-06-22 06:35:49 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-06-22 06:35:49 -0700 |
| commit | 470e1a1ecfac3dcc8804c1e786dc4b7abeb710b9 (patch) | |
| tree | 365dd37b646e6042dc471c30016a2efc403edeef | |
| parent | 17c77ee20a349d89736911383bd6e829431153c6 (diff) | |
| parent | 82f785bc6751dc7c199b5d1ea068567120b92511 (diff) | |
| download | zsh-470e1a1ecfac3dcc8804c1e786dc4b7abeb710b9.tar.gz zsh-470e1a1ecfac3dcc8804c1e786dc4b7abeb710b9.tar.bz2 zsh-470e1a1ecfac3dcc8804c1e786dc4b7abeb710b9.zip | |
Merge pull request #1173 from walkah/virtualenvwrapper-osx-fix
Readlink is different on OS X
| -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 |