diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2017-11-12 19:36:24 -0700 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2017-11-12 19:36:24 -0700 |
| commit | 5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436 (patch) | |
| tree | 2c9ab05f372ad5da84662e18a4d7e258b75d3b17 /plugins/pyenv/pyenv.plugin.zsh | |
| parent | 6bcf7764f8d8094695c7c04bb9532a0ede40ab37 (diff) | |
| parent | 41eedd37005f6b3668fcebe2a5f5a26324753519 (diff) | |
| download | zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.tar.gz zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.tar.bz2 zsh-5e1ad5efbf59a40ef6dc6d404c6f403dff8ed436.zip | |
Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'plugins/pyenv/pyenv.plugin.zsh')
| -rw-r--r-- | plugins/pyenv/pyenv.plugin.zsh | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh index aa1f9488a..ec3ae9f5b 100644 --- a/plugins/pyenv/pyenv.plugin.zsh +++ b/plugins/pyenv/pyenv.plugin.zsh @@ -8,9 +8,6 @@ _pyenv-from-homebrew-installed() { FOUND_PYENV=0 pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv") -if _homebrew-installed && _pyenv-from-homebrew-installed ; then - pyenvdirs=($(brew --prefix pyenv) "${pyenvdirs[@]}") -fi for pyenvdir in "${pyenvdirs[@]}" ; do if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; then @@ -31,5 +28,23 @@ done unset pyenvdir if [ $FOUND_PYENV -eq 0 ] ; then + pyenvdir=$(brew --prefix pyenv 2> /dev/null) + if [ $? -eq 0 -a -d $pyenvdir/bin ] ; then + FOUND_PYENV=1 + export PYENV_ROOT=$pyenvdir + export PATH=${pyenvdir}/bin:$PATH + eval "$(pyenv init - zsh)" + + if pyenv commands | command grep -q virtualenv-init; then + eval "$(pyenv virtualenv-init - zsh)" + fi + + function pyenv_prompt_info() { + echo "$(pyenv version-name)" + } + fi +fi + +if [ $FOUND_PYENV -eq 0 ] ; then function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" } fi |