diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-05-26 18:02:46 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-05-26 18:05:11 +0200 |
| commit | 68d51bd7d83050589ca602059a6e2fb26c2cec39 (patch) | |
| tree | acb5ac218804bf3656df364c2033f168f53826e0 /plugins/virtualenvwrapper | |
| parent | 375978fb5bca134009790db7913bdf6bc8e795fa (diff) | |
| download | zsh-68d51bd7d83050589ca602059a6e2fb26c2cec39.tar.gz zsh-68d51bd7d83050589ca602059a6e2fb26c2cec39.tar.bz2 zsh-68d51bd7d83050589ca602059a6e2fb26c2cec39.zip | |
virtualenvwrapper: fix load and detection logic
Diffstat (limited to 'plugins/virtualenvwrapper')
| -rw-r--r-- | plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 2cbfc47d5..88217a7f5 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -1,23 +1,24 @@ function { # search in these locations for the init script: - for f in $commands[virtualenvwrapper_lazy.sh] \ - $commands[virtualenvwrapper.sh] \ - /usr/share/virtualenvwrapper/virtualenvwrapper{_lazy,}.sh \ - /usr/local/bin/virtualenvwrapper{_lazy,}.sh \ - /etc/bash_completion.d/virtualenvwrapper \ - /usr/share/bash-completion/completions/virtualenvwrapper \ - $HOME/.local/bin/virtualenvwrapper.sh + for virtualenvwrapper in $commands[virtualenvwrapper_lazy.sh] \ + $commands[virtualenvwrapper.sh] \ + /usr/share/virtualenvwrapper/virtualenvwrapper{_lazy,}.sh \ + /usr/local/bin/virtualenvwrapper{_lazy,}.sh \ + /etc/bash_completion.d/virtualenvwrapper \ + /usr/share/bash-completion/completions/virtualenvwrapper \ + $HOME/.local/bin/virtualenvwrapper.sh do - if [[ -f $f ]]; then - source $f + if [[ -f "$virtualenvwrapper" ]]; then + source "$virtualenvwrapper" return fi done print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find virtualenvwrapper.sh.\n"\ "Please install with \`pip install virtualenvwrapper\`" >&2 + return 1 } -if ! type workon &>/dev/null; then +if [[ $? -eq 0 ]] && ! type workon &>/dev/null; then print "[oh-my-zsh] virtualenvwrapper plugin: shell function 'workon' not defined.\n"\ "Please check ${virtualenvwrapper}" >&2 return |