From 7e8223eac14241bc0156fe8d983460edf537f412 Mon Sep 17 00:00:00 2001
From: Yamashita Yuu <yamashita@geishatokyo.com>
Date: Fri, 4 Jul 2014 15:44:55 +0900
Subject: [PATCH] Fix issues with manual activation of virtual environments
 (#34)

---
 bin/pyenv-sh-activate     |  6 ++++--
 bin/pyenv-sh-deactivate   |  6 ++++--
 bin/pyenv-virtualenv-init |  8 ++++----
 test/activate.bats        | 18 ++++++++++++------
 test/deactivate.bats      | 12 ++++++++----
 test/init.bats            | 12 ++++++------
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/bin/pyenv-sh-activate b/bin/pyenv-sh-activate
index eaa6b75..ff8967e 100755
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -78,13 +78,15 @@ case "$shell" in
 fish )
   cat <<EOS
 set -e PYENV_DEACTIVATE;
-. "$(pyenv-prefix "${versions}")/bin/activate.fish";
+setenv PYENV_ACTIVATE "$(pyenv-prefix "${versions}")";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
  ;;
 *    )
   cat <<EOS
 unset PYENV_DEACTIVATE;
-source "$(pyenv-prefix "${versions}")/bin/activate";
+export PYENV_ACTIVATE="$(pyenv-prefix "${versions}")";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
   ;;
 esac
diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index 85e2803..82610a8 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -14,7 +14,8 @@ case "$shell" in
 fish )
   cat <<EOS
 if functions -q deactivate
-  setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
   deactivate;
 end;
 EOS
@@ -22,7 +23,8 @@ EOS
 *    )
   cat <<EOS
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
   deactivate;
 fi;
 EOS
diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init
index 8e0b11c..943bcec 100755
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -75,12 +75,12 @@ case "$shell" in
 fish )
   cat <<EOS
 function _pyenv_virtualenv_hook --on-event fish_prompt;
-  if [ -n "\$VIRTUAL_ENV" ]
+  if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
       eval (pyenv sh-deactivate); or true
       return 0
     end
-    if [ "\$VIRTUAL_ENV" != (pyenv prefix) ]
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
       eval (pyenv sh-deactivate); or true
       eval (pyenv sh-activate 2>/dev/null); or true
     end
@@ -106,12 +106,12 @@ esac
 
 if [[ "$shell" != "fish" ]]; then
   cat <<EOS
-  if [ -n "\$VIRTUAL_ENV" ]; then
+  if [ -n "\$PYENV_ACTIVATE" ]; then
     if [ "x\`pyenv version-name\`" = "xsystem" ]; then
       pyenv deactivate || true
       return 0
     fi
-    if [ "x\$VIRTUAL_ENV" != "x\`pyenv prefix\`" ]; then
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
       pyenv deactivate || true
       pyenv activate 2>/dev/null || true
     fi
diff --git a/test/activate.bats b/test/activate.bats
index a6a65d0..15b4056 100644
--- a/test/activate.bats
+++ b/test/activate.bats
@@ -23,7 +23,8 @@ setup() {
   assert_success
   assert_output <<EOS
 unset PYENV_DEACTIVATE;
-source "${PYENV_ROOT}/versions/venv/bin/activate";
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -44,7 +45,8 @@ EOS
   assert_output <<EOS
 pyenv shell "venv";
 unset PYENV_DEACTIVATE;
-source "${PYENV_ROOT}/versions/venv/bin/activate";
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -64,7 +66,8 @@ EOS
   assert_success
   assert_output <<EOS
 set -e PYENV_DEACTIVATE;
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
+setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -85,7 +88,8 @@ EOS
   assert_output <<EOS
 pyenv shell "venv";
 set -e PYENV_DEACTIVATE;
-. "${PYENV_ROOT}/versions/venv/bin/activate.fish";
+setenv PYENV_ACTIVATE "${PYENV_ROOT}/versions/venv";
+. "\${PYENV_ACTIVATE}/bin/activate.fish";
 EOS
 }
 
@@ -104,7 +108,8 @@ EOS
   assert_output <<EOS
 pyenv shell "venv27";
 unset PYENV_DEACTIVATE;
-source "${PYENV_ROOT}/versions/venv27/bin/activate";
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
@@ -123,7 +128,8 @@ EOS
   assert_output <<EOS
 pyenv shell "venv27";
 unset PYENV_DEACTIVATE;
-source "${PYENV_ROOT}/versions/venv27/bin/activate";
+export PYENV_ACTIVATE="${PYENV_ROOT}/versions/venv27";
+source "\${PYENV_ACTIVATE}/bin/activate";
 EOS
 }
 
diff --git a/test/deactivate.bats b/test/deactivate.bats
index 1f8331a..fc95c03 100644
--- a/test/deactivate.bats
+++ b/test/deactivate.bats
@@ -14,7 +14,8 @@ setup() {
   assert_success
   assert_output <<EOS
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
   deactivate;
 fi;
 EOS
@@ -28,7 +29,8 @@ EOS
   assert_success
   assert_output <<EOS
 if declare -f deactivate 1>/dev/null 2>&1; then
-  export PYENV_DEACTIVATE="\$VIRTUAL_ENV";
+  export PYENV_DEACTIVATE="\$PYENV_ACTIVATE";
+  unset PYENV_ACTIVATE;
   deactivate;
 fi;
 pyenv shell --unset;
@@ -43,7 +45,8 @@ EOS
   assert_success
   assert_output <<EOS
 if functions -q deactivate
-  setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
   deactivate;
 end;
 EOS
@@ -57,7 +60,8 @@ EOS
   assert_success
   assert_output <<EOS
 if functions -q deactivate
-  setenv PYENV_DEACTIVATE "\$VIRTUAL_ENV";
+  setenv PYENV_DEACTIVATE "\$PYENV_ACTIVATE";
+  set -e PYENV_ACTIVATE;
   deactivate;
 end;
 pyenv shell --unset;
diff --git a/test/init.bats b/test/init.bats
index afd03ce..fe0a531 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -31,12 +31,12 @@ load test_helper
   assert_output <<EOS
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
-  if [ -n "\$VIRTUAL_ENV" ]; then
+  if [ -n "\$PYENV_ACTIVATE" ]; then
     if [ "x\`pyenv version-name\`" = "xsystem" ]; then
       pyenv deactivate || true
       return 0
     fi
-    if [ "x\$VIRTUAL_ENV" != "x\`pyenv prefix\`" ]; then
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
       pyenv deactivate || true
       pyenv activate 2>/dev/null || true
     fi
@@ -58,12 +58,12 @@ EOS
   assert_output <<EOS
 setenv PYENV_VIRTUALENV_INIT 1;
 function _pyenv_virtualenv_hook --on-event fish_prompt;
-  if [ -n "\$VIRTUAL_ENV" ]
+  if [ -n "\$PYENV_ACTIVATE" ]
     if [ (pyenv version-name) = "system" ]
       eval (pyenv sh-deactivate); or true
       return 0
     end
-    if [ "\$VIRTUAL_ENV" != (pyenv prefix) ]
+    if [ "\$PYENV_ACTIVATE" != (pyenv prefix) ]
       eval (pyenv sh-deactivate); or true
       eval (pyenv sh-activate 2>/dev/null); or true
     end
@@ -82,12 +82,12 @@ EOS
   assert_output <<EOS
 export PYENV_VIRTUALENV_INIT=1;
 _pyenv_virtualenv_hook() {
-  if [ -n "\$VIRTUAL_ENV" ]; then
+  if [ -n "\$PYENV_ACTIVATE" ]; then
     if [ "x\`pyenv version-name\`" = "xsystem" ]; then
       pyenv deactivate || true
       return 0
     fi
-    if [ "x\$VIRTUAL_ENV" != "x\`pyenv prefix\`" ]; then
+    if [ "x\$PYENV_ACTIVATE" != "x\`pyenv prefix\`" ]; then
       pyenv deactivate || true
       pyenv activate 2>/dev/null || true
     fi