From 6b4d6249a0e1be67180e9c2a57d52824f6e128eb Mon Sep 17 00:00:00 2001
From: Yamashita Yuu <yamashita@geishatokyo.com>
Date: Sat, 5 Jul 2014 07:26:48 +0900
Subject: [PATCH] No need to use `eval` in fish init script

---
 bin/pyenv-virtualenv-init | 10 +++++-----
 test/init.bats            | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init
index 68beb50..c0a4b1b 100755
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -77,19 +77,19 @@ fish )
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
-      eval (pyenv sh-deactivate --no-error --verbose)
+      pyenv deactivate --no-error --verbose
       return 0
     end
     if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
-      if eval (pyenv sh-deactivate --no-error --verbose)
-        eval (pyenv sh-activate --no-error --verbose); or set -e PYENV_DEACTIVATE
+      if pyenv deactivate --no-error --verbose
+        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
       else
-        eval (pyenv sh-activate --no-error --verbose)
+        pyenv activate --no-error --verbose
       end
     end
   else
     if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
-      eval (pyenv sh-activate --no-error --verbose)
+      pyenv activate --no-error --verbose
     end
   end
 end
diff --git a/test/init.bats b/test/init.bats
index f000a2c..3489357 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -63,19 +63,19 @@ setenv PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
   if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
-      eval (pyenv sh-deactivate --no-error --verbose)
+      pyenv deactivate --no-error --verbose
       return 0
     end
     if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
-      if eval (pyenv sh-deactivate --no-error --verbose)
-        eval (pyenv sh-activate --no-error --verbose); or set -e PYENV_DEACTIVATE
+      if pyenv deactivate --no-error --verbose
+        pyenv activate --no-error --verbose; or set -e PYENV_DEACTIVATE
       else
-        eval (pyenv sh-activate --no-error --verbose)
+        pyenv activate --no-error --verbose
       end
     end
   else
     if [ -z "\$VIRTUAL_ENV" ]; and [ "\$PYENV_DEACTIVATE" != (pyenv prefix) ]
-      eval (pyenv sh-activate --no-error --verbose)
+      pyenv activate --no-error --verbose
     end
   end
 end