Merge pull request #680 from dinhnv/pyenv-patched

pyenv promt segment uses $PYENV_VERSION environment variable"
pull/22/head
Ben Hilburn 7 years ago committed by GitHub
commit efacc622a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1379,18 +1379,10 @@ prompt_virtualenv() {
} }
# pyenv: current active python version (with restrictions) # pyenv: current active python version (with restrictions)
# More information on pyenv (Python version manager like rbenv and rvm): # https://github.com/pyenv/pyenv#choosing-the-python-version
# https://github.com/yyuu/pyenv
# the prompt parses output of pyenv version and only displays the first word
prompt_pyenv() { prompt_pyenv() {
local pyenv_version="$(pyenv version 2>/dev/null)" if [[ -n "$PYENV_VERSION" ]]; then
pyenv_version="${pyenv_version%% *}" "$1_prompt_segment" "$0" "$2" "blue" "$DEFAULT_COLOR" "$PYENV_VERSION" 'PYTHON_ICON'
# XXX: The following should return the same as above.
# This reads better for devs familiar with sed/awk/grep/cut utilities
# Using shell expansion/substitution may hamper future maintainability
#local pyenv_version="$(pyenv version 2>/dev/null | head -n1 | cut -d' ' -f1)"
if [[ -n "$pyenv_version" && "$pyenv_version" != "system" ]]; then
"$1_prompt_segment" "$0" "$2" "blue" "$DEFAULT_COLOR" "$pyenv_version" 'PYTHON_ICON'
fi fi
} }

Loading…
Cancel
Save