Merge 31afbc760e
into 4fec0a46e7
This commit is contained in:
commit
5a448e96a6
|
@ -36,41 +36,37 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
|
||||||
function workon_cwd {
|
function workon_cwd {
|
||||||
if [[ -z "$WORKON_CWD" ]]; then
|
if [[ -z "$WORKON_CWD" ]]; then
|
||||||
local WORKON_CWD=1
|
local WORKON_CWD=1
|
||||||
# Check if this is a Git repo
|
|
||||||
local GIT_REPO_ROOT=""
|
|
||||||
local GIT_TOPLEVEL="$(git rev-parse --show-toplevel 2> /dev/null)"
|
|
||||||
if [[ $? == 0 ]]; then
|
|
||||||
GIT_REPO_ROOT="$GIT_TOPLEVEL"
|
|
||||||
fi
|
|
||||||
# Get absolute path, resolving symlinks
|
# Get absolute path, resolving symlinks
|
||||||
local PROJECT_ROOT="${PWD:A}"
|
local PROJECT_ROOT="${PWD:A}"
|
||||||
while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
|
while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \
|
||||||
&& ! -d "$PROJECT_ROOT/.git" && "$PROJECT_ROOT" != "$GIT_REPO_ROOT" ]]; do
|
&& ! -d "$PROJECT_ROOT/.git" ]]; do
|
||||||
PROJECT_ROOT="${PROJECT_ROOT:h}"
|
PROJECT_ROOT="${PROJECT_ROOT:h}"
|
||||||
done
|
done
|
||||||
if [[ "$PROJECT_ROOT" == "/" ]]; then
|
|
||||||
PROJECT_ROOT="."
|
|
||||||
fi
|
|
||||||
# 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
|
elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then
|
||||||
ENV_NAME="$PROJECT_ROOT/.venv"
|
ENV_NAME="$PROJECT_ROOT/.venv"
|
||||||
elif [[ "$PROJECT_ROOT" != "." ]]; then
|
elif [[ "$PROJECT_ROOT" != "/" ]]; then
|
||||||
ENV_NAME="${PROJECT_ROOT:t}"
|
ENV_NAME="${PROJECT_ROOT:t}"
|
||||||
else
|
else
|
||||||
ENV_NAME=""
|
ENV_NAME=""
|
||||||
fi
|
fi
|
||||||
if [[ "$ENV_NAME" != "" ]]; then
|
if [[ "$ENV_NAME" != "" ]]; then
|
||||||
# Activate the environment only if it is not already active
|
# Activate the environment only if it is not already active
|
||||||
if [[ "$VIRTUAL_ENV" != "$WORKON_HOME/$ENV_NAME" ]]; then
|
if [[ ! "$VIRTUAL_ENV" -ef "$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
|
elif [[ -e "$ENV_NAME/bin/activate" ]]; then
|
||||||
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
|
source $ENV_NAME/bin/activate && export CD_VIRTUAL_ENV="$ENV_NAME"
|
||||||
|
else
|
||||||
|
ENV_NAME=""
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
elif [[ -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
|
fi
|
||||||
|
|
||||||
|
if [[ "$ENV_NAME" == "" && -n $CD_VIRTUAL_ENV && -n $VIRTUAL_ENV ]]; then
|
||||||
# We've just left the repo, deactivate the environment
|
# We've just left the repo, deactivate the environment
|
||||||
# Note: this only happens if the virtualenv was activated automatically
|
# Note: this only happens if the virtualenv was activated automatically
|
||||||
deactivate && unset CD_VIRTUAL_ENV
|
deactivate && unset CD_VIRTUAL_ENV
|
||||||
|
|
Loading…
Reference in New Issue
Block a user