Merge pull request #3918 from cbazin/master
Detect the .venv in any parent directory of the current directory
This commit is contained in:
commit
0a8ca6adff
|
@ -37,8 +37,11 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
|
||||||
if [ ! $WORKON_CWD ]; then
|
if [ ! $WORKON_CWD ]; then
|
||||||
WORKON_CWD=1
|
WORKON_CWD=1
|
||||||
# Check if this is a Git repo
|
# Check if this is a Git repo
|
||||||
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null`
|
PROJECT_ROOT=`pwd`
|
||||||
if (( $? != 0 )); then
|
while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" ]]; do
|
||||||
|
PROJECT_ROOT=`realpath $PROJECT_ROOT/..`
|
||||||
|
done
|
||||||
|
if [[ "$PROJECT_ROOT" == "/" ]]; then
|
||||||
PROJECT_ROOT="."
|
PROJECT_ROOT="."
|
||||||
fi
|
fi
|
||||||
# Check for virtualenv name override
|
# Check for virtualenv name override
|
||||||
|
|
Loading…
Reference in a new issue