From b85e1dd5d6b0ee527b313ce8c902bbc4e34e36e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com>
Date: Wed, 18 Aug 2021 11:47:50 +0200
Subject: [PATCH] fix(pyenv): fix for checking if pyenv-virtualenv is installed

Fixes #8467
---
 plugins/pyenv/pyenv.plugin.zsh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index 275c12c80..bcf80a6a2 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -46,16 +46,20 @@ For more info go to https://github.com/pyenv/pyenv/#installation.
 EOF
 
     # Configuring in .zshrc only makes pyenv available for interactive shells
-    export PYENV_ROOT=$dir
+    export PYENV_ROOT="$dir"
     export PATH="$PYENV_ROOT/bin:$PATH"
     eval "$(pyenv init --path)"
   fi
 fi
 
 if [[ $FOUND_PYENV -eq 1 ]]; then
+  if [[ -z "$PYENV_ROOT" ]]; then
+    export PYENV_ROOT="$(pyenv root)"
+  fi
+
   eval "$(pyenv init - --no-rehash zsh)"
 
-  if (( ${+commands[pyenv-virtualenv-init]} )); then
+  if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi