python: only override virtualenv python if not set

Fixes sorin-ionescu#1520
ivanalejandro0 · Feb 22, 2021 · 1e8c321 · 1e8c321
1 parent 6c9a825
commit 1e8c321
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external
diff --git a/modules/python/init.zsh b/modules/python/init.zsh
@@ -116,16 +116,19 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) && \
     # in '$path' or in an alternative location on a Debian based system.
     #
     # If the python-path was manually specified, use that. Otherwise, if
-    # homebrew is installed we fall back to python3 then python2 in that
-    # order. This is needed to fix an issue with virtualenvwrapper as homebrew
-    # no longer shadows the system python.
+    # homebrew is installed and it wasn't overridden via environment variable
+    # we fall back to python3 then python2 in that order. This is needed to
+    # fix an issue with virtualenvwrapper as homebrew no longer shadows the
+    # system python.
     zstyle -s ':prezto:module:python:virtualenvwrapper' python-path '_venv_python'
     if [[ -n "$_venv_python" ]]; then
       export VIRTUALENVWRAPPER_PYTHON=$_venv_python
-    elif (( $+commands[brew] )) && (( $+commands[python3] )); then
-      export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
-    elif (( $+commands[brew] )) && (( $+commands[python2] )); then
-      export VIRTUALENVWRAPPER_PYTHON=$commands[python2]
+    elif [[ -z "$VIRTUALENVWRAPPER_PYTHON" ]] && (( $+commands[brew] )); then
+      if (( $+commands[python3] )); then
+        export VIRTUALENVWRAPPER_PYTHON=$commands[python3]
+      elif (( $+commands[python2] )); then
+        export VIRTUALENVWRAPPER_PYTHON=$commands[python2]
+      fi
     fi
 
     virtenv_sources=(
+0 −4		CHANGELOG.md
+0 −1		Makefile
+0 −2		README.md
+1 −1		VERSION
+3 −3		circle.yml
+2 −12		src/strategies/default.zsh
+3 −10		src/strategies/match_prev_cmd.zsh
+0 −11		src/util.zsh
+6 −34		zsh-autosuggestions.zsh