Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
oh-my-zsh
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
github
oh-my-zsh
Commits
19710a2d
Unverified
Commit
19710a2d
authored
Sep 06, 2021
by
Terry
Committed by
GitHub
Sep 06, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(pyenv): do not warn if PYENV_ROOT is undefined (#10162)
Co-authored-by:
Terry Moschou
<
terry.moschou@fivecast.com
>
parent
1b03896a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
pyenv.plugin.zsh
plugins/pyenv/pyenv.plugin.zsh
+4
-4
No files found.
plugins/pyenv/pyenv.plugin.zsh
View file @
19710a2d
...
@@ -62,14 +62,14 @@ if [[ $FOUND_PYENV -ne 1 ]]; then
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment