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.

fix(pyenv): fix for ignoring pyenv-win commands
5377cc37 · Marc Cornellà · c8a25869 · 5377cc37
Unverified Commit 5377cc37 authored Jul 26, 2021 by Marc Cornellà
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

pyenv.plugin.zsh plugins/pyenv/pyenv.plugin.zsh +6 -4

No files found.
--- a/plugins/pyenv/pyenv.plugin.zsh
+++ b/plugins/pyenv/pyenv.plugin.zsh
 # 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)