|
|
|
@ -8,14 +8,22 @@ if [[ -f "$wrapsource" ]]; then |
|
|
|
# directory name of the project. Virtual environment name can be overridden |
|
|
|
# directory name of the project. Virtual environment name can be overridden |
|
|
|
# by placing a .venv file in the project root with a virtualenv name in it |
|
|
|
# by placing a .venv file in the project root with a virtualenv name in it |
|
|
|
function workon_cwd { |
|
|
|
function workon_cwd { |
|
|
|
# Check that this is a Git repo |
|
|
|
if [ ! $WORKON_CWD ]; then |
|
|
|
|
|
|
|
WORKON_CWD=1 |
|
|
|
|
|
|
|
# Check if this is a Git repo |
|
|
|
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` |
|
|
|
PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` |
|
|
|
if (( $? == 0 )); then |
|
|
|
if (( $? != 0 )); then |
|
|
|
|
|
|
|
PROJECT_ROOT="." |
|
|
|
|
|
|
|
fi |
|
|
|
# Check for virtualenv name override |
|
|
|
# Check for virtualenv name override |
|
|
|
ENV_NAME=`basename "$PROJECT_ROOT"` |
|
|
|
|
|
|
|
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 [[ "$PROJECT_ROOT" != "." ]]; then |
|
|
|
|
|
|
|
ENV_NAME=`basename "$PROJECT_ROOT"` |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
ENV_NAME="" |
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
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" != "$WORKON_HOME/$ENV_NAME" ]]; then |
|
|
|
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then |
|
|
|
if [[ -e "$WORKON_HOME/$ENV_NAME/bin/activate" ]]; then |
|
|
|
@ -28,6 +36,8 @@ if [[ -f "$wrapsource" ]]; then |
|
|
|
deactivate && unset CD_VIRTUAL_ENV |
|
|
|
deactivate && unset CD_VIRTUAL_ENV |
|
|
|
fi |
|
|
|
fi |
|
|
|
unset PROJECT_ROOT |
|
|
|
unset PROJECT_ROOT |
|
|
|
|
|
|
|
unset WORKON_CWD |
|
|
|
|
|
|
|
fi |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
# New cd function that does the virtualenv magic |
|
|
|
# New cd function that does the virtualenv magic |
|
|
|
|