mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-25 23:30:08 +00:00
Merge pull request #2173 from jeffrey4l/venv
Add support .venv folder as virtual env
This commit is contained in:
commit
032ca0d67c
1 changed files with 4 additions and 0 deletions
|
@ -17,6 +17,8 @@ if (( $+commands[$virtualenvwrapper] )); then
|
||||||
# Check for virtualenv name override
|
# Check for virtualenv name override
|
||||||
if [[ -f "$PROJECT_ROOT/.venv" ]]; then
|
if [[ -f "$PROJECT_ROOT/.venv" ]]; then
|
||||||
ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
|
ENV_NAME=`cat "$PROJECT_ROOT/.venv"`
|
||||||
|
elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
|
||||||
|
ENV_NAME="$PROJECT_ROOT/.venv"
|
||||||
elif [[ "$PROJECT_ROOT" != "." ]]; then
|
elif [[ "$PROJECT_ROOT" != "." ]]; then
|
||||||
ENV_NAME=`basename "$PROJECT_ROOT"`
|
ENV_NAME=`basename "$PROJECT_ROOT"`
|
||||||
else
|
else
|
||||||
|
@ -27,6 +29,8 @@ if (( $+commands[$virtualenvwrapper] )); then
|
||||||
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
|
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
|
||||||
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
|
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then
|
||||||
workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
|
workon "$ENV_NAME" && export CD_VIRTUAL_ENV="$ENV_NAME"
|
||||||
|
elif [[ -e "$ENV_NAME/bin/activate" ]]; then
|
||||||
|
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
elif [ $CD_VIRTUAL_ENV ]; then
|
elif [ $CD_VIRTUAL_ENV ]; then
|
||||||
|
|
Loading…
Reference in a new issue