diff options
| author | Robby Russell <robby@planetargon.com> | 2014-03-22 13:28:30 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-03-22 13:28:30 -0700 |
| commit | 123510382dae6a950ff50cda60de040ca2932374 (patch) | |
| tree | 68fe7e5b7f01653feb6883c79c17d728dec5edfe /plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | |
| parent | c97aff8f6ba8d0b06db9f239723cce83e4430a4b (diff) | |
| parent | 3be2e34d9638b7e552208596eca49fbc66c05574 (diff) | |
| download | zsh-123510382dae6a950ff50cda60de040ca2932374.tar.gz zsh-123510382dae6a950ff50cda60de040ca2932374.tar.bz2 zsh-123510382dae6a950ff50cda60de040ca2932374.zip | |
Merge pull request #2615 from erbridge/fix_virtualenvwrapper_lazy
Don't lazy load the virtualenvwrapper
Diffstat (limited to 'plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh')
| -rw-r--r-- | plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 16f32da6e..f58bda1ad 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -1,4 +1,4 @@ -virtualenvwrapper='virtualenvwrapper_lazy.sh' +virtualenvwrapper='virtualenvwrapper.sh' if (( $+commands[$virtualenvwrapper] )); then source ${${virtualenvwrapper}:c} @@ -17,7 +17,7 @@ if (( $+commands[$virtualenvwrapper] )); then # Check for virtualenv name override if [[ -f "$PROJECT_ROOT/.venv" ]]; then 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" elif [[ "$PROJECT_ROOT" != "." ]]; then ENV_NAME=`basename "$PROJECT_ROOT"` |