From 240a1de6e560cb242971b0c79b9bd191cdaea8f3 Mon Sep 17 00:00:00 2001
From: Tony Wang <wwwjfy@gmail.com>
Date: Mon, 5 Jan 2015 23:23:43 +0800
Subject: [PATCH] fix warns for virtualenv-init corner case on fish

The situation is when in a directory containing python binary,
`pyenv prefix' will return empty (caused by `pyenv which' returning
"./python"). This change adds quotes for `test', otherwise `test' will
warn about missing argument.
---
 bin/pyenv-virtualenv-init | 6 +++---
 test/init.bats            | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init
index 605b128..a02d9a8 100755
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -76,12 +76,12 @@ fish )
   cat <<EOS
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   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
     end
-    if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null; or 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; or true) ]
+    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "(pyenv prefix 2>/dev/null; or true)" ]
       pyenv activate --no-error --verbose
     end
   end
diff --git a/test/init.bats b/test/init.bats
index c50535d..3ad95bf 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -64,12 +64,12 @@ EOS
 setenv PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   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
     end
-    if [ "\$PYENV_ACTIVATE" != (pyenv prefix 2>/dev/null; or 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
@@ -78,7 +78,7 @@ function _pyenv_virtualenv_hook --on-event fish_prompt;
       end
     end
   else
-    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix 2>/dev/null; or true) ]
+    if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != "(pyenv prefix 2>/dev/null; or true)" ]
       pyenv activate --no-error --verbose
     end
   end