dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-02-02 01:56:47 +00:00
Code Issues Releases Wiki Activity

python: only override virtualenv python if not set

Browse Source 
Fixes #1520
This commit is contained in:
Kaleb Elwert 2017-12-14 17:11:03 -08:00
parent d8d6b4d70a
commit 4c31107e3b
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/autosuggestions/external

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

17
modules/python/init.zsh
View File

@ -116,16 +116,19 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
# 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, if # If the python-path was manually specified, use that. Otherwise, if
# homebrew is installed we fall back to python3 then python2 in that # homebrew is installed and it wasn't overridden via environment variable
# order. This is needed to fix an issue with virtualenvwrapper as homebrew # we fall back to python3 then python2 in that order. This is needed to
# no longer shadows the system python. # fix an issue with virtualenvwrapper as homebrew 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[brew] )) && (( $+commands[python3] )); then elif [[ -z "$VIRTUALENVWRAPPER_PYTHON" ]] && (( $+commands[brew] )); then
export VIRTUALENVWRAPPER_PYTHON=$commands[python3] if (( $+commands[python3] )); then
elif (( $+commands[brew] )) && (( $+commands[python2] )); then export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
export VIRTUALENVWRAPPER_PYTHON=$commands[python2] elif (( $+commands[python2] )); then
export VIRTUALENVWRAPPER_PYTHON=$commands[python2]
fi
fi fi
virtenv_sources=( virtenv_sources=(