diff options
| author | James Walker <walkah@walkah.net> | 2012-06-18 10:41:19 -0400 |
|---|---|---|
| committer | James Walker <walkah@walkah.net> | 2012-06-18 10:41:19 -0400 |
| commit | 82f785bc6751dc7c199b5d1ea068567120b92511 (patch) | |
| tree | 6ad978dc8d2aef0dc2a645895554326dd8c715d9 /plugins/virtualenvwrapper | |
| parent | e8d582aba98d57214a374bed01570ba791c54d9e (diff) | |
| download | zsh-82f785bc6751dc7c199b5d1ea068567120b92511.tar.gz zsh-82f785bc6751dc7c199b5d1ea068567120b92511.tar.bz2 zsh-82f785bc6751dc7c199b5d1ea068567120b92511.zip | |
remove readlink call and clean up
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 |