mirror of
https://github.com/robbyrussell/oh-my-zsh.git
synced 2025-12-06 15:30:40 +01:00
Don't lazy load the virtualenvwrapper.
Fix robbyrussell#2355.
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
virtualenvwrapper='virtualenvwrapper_lazy.sh'
|
virtualenvwrapper='virtualenvwrapper.sh'
|
||||||
if (( $+commands[$virtualenvwrapper] )); then
|
if (( $+commands[$virtualenvwrapper] )); then
|
||||||
source ${${virtualenvwrapper}:c}
|
source ${${virtualenvwrapper}:c}
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ 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
|
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=`basename "$PROJECT_ROOT"`
|
ENV_NAME=`basename "$PROJECT_ROOT"`
|
||||||
|
|||||||
Reference in New Issue
Block a user