diff options
| author | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-22 21:24:52 -0400 |
|---|---|---|
| committer | Bob Williams <bobwilliams.ii@gmail.com> | 2014-03-22 21:24:52 -0400 |
| commit | d70e73294494e68c94879c7bf22f708a3049a9d4 (patch) | |
| tree | 696f9a6cb49cab00924942eb5147b99b5fb1798d /plugins/virtualenvwrapper | |
| parent | 5a586670d73dbbda97d124e33398aabf21597659 (diff) | |
| parent | 178b5224e830845e45070ef803fcdb5a3f468dca (diff) | |
| download | zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.tar.gz zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.tar.bz2 zsh-d70e73294494e68c94879c7bf22f708a3049a9d4.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'plugins/virtualenvwrapper')
| -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"` |