summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorepelletier <enguerrand.pelletier@supinfo.com>2015-05-21 17:34:24 +0200
committerepelletier <enguerrand.pelletier@supinfo.com>2015-05-21 17:34:24 +0200
commit7b478d75a3a0db466e78b6e46a0e468d64354618 (patch)
tree926923bb6cecefcc3405b75d771df4d6c36f4ddd /plugins
parent140034605edd0f72c548685d39e49687a44c1b23 (diff)
downloadzsh-7b478d75a3a0db466e78b6e46a0e468d64354618.tar.gz
zsh-7b478d75a3a0db466e78b6e46a0e468d64354618.tar.bz2
zsh-7b478d75a3a0db466e78b6e46a0e468d64354618.zip
Detect the .venv in any parent directory of the current directory
Diffstat (limited to 'plugins')
-rw-r--r--plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index 5faa1a823..b3a3b56d5 100644
--- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -29,8 +29,11 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
if [ ! $WORKON_CWD ]; then
WORKON_CWD=1
# Check if this is a Git repo
- PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
- if (( $? != 0 )); then
+ PROJECT_ROOT=`pwd`
+ while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
+ PROJECT_ROOT=`realpath $PROJECT_ROOT/..`
+ done
+ if [[ "$PROJECT_ROOT" == "/" ]]; then
PROJECT_ROOT="."
fi
# Check for virtualenv name override