diff options
| author | Tuowen Zhao <ztuowen@gmail.com> | 2018-04-25 15:36:48 -0600 |
|---|---|---|
| committer | Tuowen Zhao <ztuowen@gmail.com> | 2018-04-25 15:36:48 -0600 |
| commit | 1481f7aa67df42bdf45953231637194ac200d240 (patch) | |
| tree | 7d41eb6b369e3ab0f25753623c966b69340e54cf /plugins/pyenv | |
| parent | b7b623d6de696b81d213ec666d072851561d5c06 (diff) | |
| parent | 9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8 (diff) | |
| download | zsh-1481f7aa67df42bdf45953231637194ac200d240.tar.gz zsh-1481f7aa67df42bdf45953231637194ac200d240.tar.bz2 zsh-1481f7aa67df42bdf45953231637194ac200d240.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 | 61 |
1 files changed, 14 insertions, 47 deletions
diff --git a/plugins/pyenv/pyenv.plugin.zsh b/plugins/pyenv/pyenv.plugin.zsh index ec3ae9f5b..76880e415 100644 --- a/plugins/pyenv/pyenv.plugin.zsh +++ b/plugins/pyenv/pyenv.plugin.zsh @@ -1,50 +1,17 @@ -_homebrew-installed() { - type brew &> /dev/null -} +# This plugin loads pyenv into the current shell and provides prompt info via +# the 'pyenv_prompt_info' function. Also loads pyenv-virtualenv if available. -_pyenv-from-homebrew-installed() { - brew --prefix pyenv &> /dev/null -} - -FOUND_PYENV=0 -pyenvdirs=("$HOME/.pyenv" "/usr/local/pyenv" "/opt/pyenv") - -for pyenvdir in "${pyenvdirs[@]}" ; do - if [ -d $pyenvdir/bin -a $FOUND_PYENV -eq 0 ] ; 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 -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)" - } +if (( $+commands[pyenv] )); then + eval "$(pyenv init - zsh)" + if (( $+commands[pyenv-virtualenv-init] )); then + eval "$(pyenv virtualenv-init - zsh)" fi -fi - -if [ $FOUND_PYENV -eq 0 ] ; then - function pyenv_prompt_info() { echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" } + function pyenv_prompt_info() { + echo "$(pyenv version-name)" + } +else + # fallback to system python + function pyenv_prompt_info() { + echo "system: $(python -V 2>&1 | cut -f 2 -d ' ')" + } fi |