mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-22 05:40:08 +00:00
Merge pull request #2615 from erbridge/fix_virtualenvwrapper_lazy
Don't lazy load the virtualenvwrapper
This commit is contained in:
commit
123510382d
1 changed files with 2 additions and 2 deletions
|
@ -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"`
|
||||||
|
|
Loading…
Reference in a new issue