linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-19 21:41:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(pyenv): do not warn if PYENV_ROOT is undefined (#10162)

Browse source 
Co-authored-by: Terry Moschou <terry.moschou@fivecast.com>
This commit is contained in:
Terry 2021-09-06 18:02:19 +09:30 committed by GitHub
parent 1b03896a0e
commit 19710a2d17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/pyenv/pyenv.plugin.zsh
View file

@ -62,14 +62,14 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
fi fi
if [[ $FOUND_PYENV -eq 1 ]]; then if [[ $FOUND_PYENV -eq 1 ]]; then
# Setup $PYENV_ROOT if not already set
if [[ -z "$PYENV_ROOT" ]]; then if [[ -z "$PYENV_ROOT" ]]; then
# This is only for backwards compatibility with users that previously relied
# on this plugin exporting it. pyenv itself does not require it to be exported
export PYENV_ROOT="$(pyenv root)" export PYENV_ROOT="$(pyenv root)"
pyenv_config_warning 'missing $PYENV_ROOT'
fi fi
# Add pyenv shims to $PATH if not already added # Add pyenv shims to $PATH if not already added
if [[ -z "${path[(Re)$PYENV_ROOT/shims]}" ]]; then if [[ -z "${path[(Re)$(pyenv root)/shims]}" ]]; then
eval "$(pyenv init --path)" eval "$(pyenv init --path)"
pyenv_config_warning 'missing pyenv shims in $PATH' pyenv_config_warning 'missing pyenv shims in $PATH'
fi fi
@ -78,7 +78,7 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
eval "$(pyenv init - --no-rehash zsh)" eval "$(pyenv init - --no-rehash zsh)"
# If pyenv-virtualenv exists, load it # If pyenv-virtualenv exists, load it
if [[ -d "$PYENV_ROOT/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then if [[ -d "$(pyenv root)/plugins/pyenv-virtualenv" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
eval "$(pyenv virtualenv-init - zsh)" eval "$(pyenv virtualenv-init - zsh)"
fi fi