From 5377cc37c0f71fe22484303a4c6f387aa339f3f5 Mon Sep 17 00:00:00 2001
From: Marc Cornellà <hello@mcornella.com>
Date: Mon, 26 Jul 2021 11:46:15 +0200
Subject: fix(pyenv): fix for ignoring pyenv-win commands
The previous fix ignored any pyenv command found in $PATH while on
WSL, regardless of whether it was correctly set up or not.
This change only ignores the pyenv command if it's proved to come
from pyenv-win by looking at its full path.
---
plugins/pyenv/pyenv.plugin.zsh | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
(limited to 'plugins/pyenv')
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh
index fedde6342..813f64b42 100644
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
@@ -1,11 +1,13 @@
# This plugin loads pyenv into the current shell and provides prompt info via
# the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available.
-# Load pyenv only if command not already available
-if command -v pyenv &> /dev/null && [[ "$(uname -r)" != *icrosoft* ]]; then
- FOUND_PYENV=1
-else
+# Look for pyenv in $PATH and verify that it's not a part of pyenv-win in WSL
+if ! command -v pyenv &>/dev/null; then
+ FOUND_PYENV=0
+elif [[ "${commands[pyenv]}" = */pyenv-win/* && "$(uname -r)" = *icrosoft* ]]; then
FOUND_PYENV=0
+else
+ FOUND_PYENV=1
fi
# Look for pyenv and try to load it (will only work on interactive shells)
--
cgit v1.2.3-70-g09d2