From f681df6f202e8d139c7bcb0dd4cfc202ea35af53 Mon Sep 17 00:00:00 2001 From: Tony Wang Date: Tue, 16 Dec 2014 17:51:57 +0800 Subject: [PATCH] fix incorrect fish syntax in pyenv-virtualenv-init --- bin/pyenv-virtualenv-init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init index 6a03e52..605b128 100755 --- a/bin/pyenv-virtualenv-init +++ b/bin/pyenv-virtualenv-init @@ -76,12 +76,12 @@ fish ) cat </dev/null || true) = "system" ] + if [ (pyenv version-name 2>/dev/null; or true) = "system" ] pyenv deactivate --no-error --verbose set -e PYENV_DEACTIVATE return 0 end - if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null || true) ] + if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null; or true) ] if pyenv deactivate --no-error --verbose set -e PYENV_DEACTIVATE pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE @@ -90,7 +90,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt; end end else - if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null || true) ] + if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null; or true) ] pyenv activate --no-error --verbose end end