diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2018-05-20 13:00:53 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2018-05-20 13:00:53 -0600 |
| commit | db38c7c3b2921783d955912262f87ee7dd8cd31b (patch) | |
| tree | 19711b0495e8472fdfb85643c2c7ec7c5a5229c3 /plugins/pyenv | |
| parent | 1481f7aa67df42bdf45953231637194ac200d240 (diff) | |
| parent | a600ab4b8578ca0a8e6c6dae0373033b9d8c201c (diff) | |
| download | zsh-db38c7c3b2921783d955912262f87ee7dd8cd31b.tar.gz zsh-db38c7c3b2921783d955912262f87ee7dd8cd31b.tar.bz2 zsh-db38c7c3b2921783d955912262f87ee7dd8cd31b.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
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 |