diff options
author | Marc Cornellà <marc.cornella@live.com> | 2018-05-15 12:07:23 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-15 12:07:23 +0200 |
commit | 0aa645f8033ef86f8c8b0729a94fc54fbec49a25 (patch) | |
tree | 37cb9f4869a41c9486bf074420cb06f9cb0e32ef /plugins/pyenv | |
parent | 2b7a41b0d2e6a67ad14f94f7cc00293491f2c3f8 (diff) | |
download | zsh-0aa645f8033ef86f8c8b0729a94fc54fbec49a25.tar.gz zsh-0aa645f8033ef86f8c8b0729a94fc54fbec49a25.tar.bz2 zsh-0aa645f8033ef86f8c8b0729a94fc54fbec49a25.zip |
pyenv: search the pyenv command if not found (#6811)
Diffstat (limited to 'plugins/pyenv')
-rw-r--r-- | plugins/pyenv/pyenv.plugin.zsh | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh index 76880e415..dbc7da472 100644 --- a/plugins/pyenv/pyenv.plugin.zsh +++ b/plugins/pyenv/pyenv.plugin.zsh @@ -1,7 +1,29 @@ # This plugin loads pyenv into the current shell and provides prompt info via # the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available. -if (( $+commands[pyenv] )); then +FOUND_PYENV=$+commands[pyenv] + +if [[ $FOUND_PYENV -ne 1 ]]; then + pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv") + for dir in $pyenvdirs; do + if [[ -d $dir/bin ]]; then + export PATH="$PATH:$dir/bin" + FOUND_PYENV=1 + break + fi + done +fi + +if [[ $FOUND_PYENV -ne 1 ]]; then + if (( $+commands[brew] )) && dir=$(brew --prefix pyenv 2>/dev/null); then + if [[ -d $dir/bin ]]; then + export PATH="$PATH:$dir/bin" + FOUND_PYENV=1 + fi + fi +fi + +if [[ $FOUND_PYENV -eq 1 ]]; then eval "$(pyenv init - zsh)" if (( $+commands[pyenv-virtualenv-init] )); then eval "$(pyenv virtualenv-init - zsh)" @@ -15,3 +37,5 @@ else echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" } fi + +unset FOUND_PYENV dir |