From a242067435ed019322a5f737c248fbeaf25f0a88 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 24 Sep 2015 14:06:20 +0200 Subject: [PATCH 1/2] Fix pyenv-virtualenv-init script for fish where command was in string and not being evaluated --- bin/pyenv-virtualenv-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init index ab0110e..2cb639c 100755 --- a/bin/pyenv-virtualenv-init +++ b/bin/pyenv-virtualenv-init @@ -78,7 +78,7 @@ fish ) function _pyenv_virtualenv_hook --on-event fish_prompt; set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true) if [ -n "\$PYENV_ACTIVATE" ] - if [ "(pyenv version-name 2>/dev/null; or true)" = "system" ] + if [ (pyenv version-name 2>/dev/null; or true) = "system" ] pyenv deactivate --no-error --verbose set -e PYENV_DEACTIVATE return 0 From d86fd13797afc6f0253518867f2ddc0b3359a5ff Mon Sep 17 00:00:00 2001 From: Jeremy Date: Thu, 24 Sep 2015 14:39:24 +0200 Subject: [PATCH 2/2] Fix test to not have quotes expected in command eval for Fish --- test/init.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/init.bats b/test/init.bats index f194263..7e7107f 100644 --- a/test/init.bats +++ b/test/init.bats @@ -85,7 +85,7 @@ setenv PYENV_VIRTUALENV_INIT 1; function _pyenv_virtualenv_hook --on-event fish_prompt; set -l PYENV_PREFIX (pyenv prefix 2>/dev/null; or true) if [ -n "\$PYENV_ACTIVATE" ] - if [ "(pyenv version-name 2>/dev/null; or true)" = "system" ] + if [ (pyenv version-name 2>/dev/null; or true) = "system" ] pyenv deactivate --no-error --verbose set -e PYENV_DEACTIVATE return 0