dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 18:38:00 +00:00
Code Issues Releases Wiki Activity

python: only override virtualenvwrapper python when needed

Browse Source 
Fixes #1519
This commit is contained in:
Kaleb Elwert 2017-12-12 23:11:51 -08:00
parent e021adeb4a
commit d8d6b4d70a
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/autosuggestions/external

@ -1 +1 @@
Subproject commit 9f9237ab8a530eeff389161202bbc7283ad6af3e Subproject commit 15931f04ffac91a2f9a1a044b6b3ee4050751064

12
modules/python/init.zsh
View File

@ -115,16 +115,16 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
# Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if available # Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if available
# in '$path' or in an alternative location on a Debian based system. # in '$path' or in an alternative location on a Debian based system.
# #
# If the python-path was manually specified, use that. Otherwise, fall back # If the python-path was manually specified, use that. Otherwise, if
# to python3 then python2 in that order. This is needed to fix an issue with # homebrew is installed we fall back to python3 then python2 in that
# virtualenvwrapper when used with homebrew, as it no longer shadows the # order. This is needed to fix an issue with virtualenvwrapper as homebrew
# system python. # no longer shadows the system python.
zstyle -s ':prezto:module:python:virtualenvwrapper' python-path '_venv_python' zstyle -s ':prezto:module:python:virtualenvwrapper' python-path '_venv_python'
if [[ -n "$_venv_python" ]]; then if [[ -n "$_venv_python" ]]; then
export VIRTUALENVWRAPPER_PYTHON=$_venv_python export VIRTUALENVWRAPPER_PYTHON=$_venv_python
elif (( $+commands[python3] )); then elif (( $+commands[brew] )) && (( $+commands[python3] )); then
export VIRTUALENVWRAPPER_PYTHON=$commands[python3] export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
elif (( $+commands[python2] )); then elif (( $+commands[brew] )) && (( $+commands[python2] )); then
export VIRTUALENVWRAPPER_PYTHON=$commands[python2] export VIRTUALENVWRAPPER_PYTHON=$commands[python2]
fi fi