From 68d51bd7d83050589ca602059a6e2fb26c2cec39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <marc.cornella@live.com>
Date: Tue, 26 May 2020 18:02:46 +0200
Subject: [PATCH] virtualenvwrapper: fix load and detection logic

---
 .../virtualenvwrapper.plugin.zsh              | 21 ++++++++++---------
 1 file 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