From 5d7894d1894564075538d8f685b85eb41d6fffa2 Mon Sep 17 00:00:00 2001
From: K Kollmann <git@k.kollmann.moe>
Date: Sun, 14 Jan 2024 18:13:31 +0100
Subject: [PATCH] fix: PATH update for non-fish shells

Checks PATH variable for existing inclusion of shims
for shells other than fish.

See PR #430
---
 bin/pyenv-virtualenv-init |  6 ++++--
 test/init.bats            | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/bin/pyenv-virtualenv-init b/bin/pyenv-virtualenv-init
index e12769a8..5bcc3784 100755
--- a/bin/pyenv-virtualenv-init
+++ b/bin/pyenv-virtualenv-init
@@ -95,8 +95,10 @@ EOS
   ;;
 * )
   cat <<EOS
-export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims"* ]]; then
+  export PATH="${PYENV_VIRTUALENV_ROOT:-${PYENV_VIRTUALENV_INSTALL_PREFIX}}/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 EOS
   ;;
 esac
diff --git a/test/init.bats b/test/init.bats
index 85f2b423..375575e4 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -50,8 +50,10 @@ load test_helper
   run pyenv-virtualenv-init - bash
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${TMP}/pyenv/plugins/pyenv-virtualenv/shims"* ]]; then
+  export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\${VIRTUAL_ENV-}" ]; then
@@ -93,8 +95,10 @@ EOS
   run pyenv-virtualenv-init - zsh
   assert_success
   assert_output <<EOS
-export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
-export PYENV_VIRTUALENV_INIT=1;
+if [[ ":$PATH:" != *"${TMP}/pyenv/plugins/pyenv-virtualenv/shims"* ]]; then
+  export PATH="${TMP}/pyenv/plugins/pyenv-virtualenv/shims:\${PATH}";
+  export PYENV_VIRTUALENV_INIT=1;
+fi
 _pyenv_virtualenv_hook() {
   local ret=\$?
   if [ -n "\${VIRTUAL_ENV-}" ]; then