From d3c1b3423eeaff4bf709c1a7c850b5bca373de99 Mon Sep 17 00:00:00 2001
From: Josh French <joshfrench@gmail.com>
Date: Sun, 19 Mar 2023 18:18:45 -0400
Subject: [PATCH] run (de)activate hooks immediately before operation

---
 bin/pyenv-sh-activate   | 6 +++---
 bin/pyenv-sh-deactivate | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bin/pyenv-sh-activate b/bin/pyenv-sh-activate
index c3f23f8..d01d0f1 100755
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -46,9 +46,6 @@ IFS=$'\n' scripts=(`pyenv-hooks activate`)
 IFS="$OLDIFS"
 for script in "${scripts[@]}"; do source "$script"; done
 
-# Execute `before_activate` hooks.
-for hook in "${before_hooks[@]}"; do eval "$hook"; done
-
 while [ $# -gt 0 ]; do
   case "$1" in
   "--complete" )
@@ -161,6 +158,9 @@ fi
 
 pyenv-sh-deactivate --force --quiet || true
 
+# Execute `before_activate` hooks.
+for hook in "${before_hooks[@]}"; do eval "$hook"; done
+
 if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then
   echo "pyenv-virtualenv: activate ${venv}" 1>&2
 fi
diff --git a/bin/pyenv-sh-deactivate b/bin/pyenv-sh-deactivate
index 86d2295..5a98142 100755
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -37,9 +37,6 @@ IFS=$'\n' scripts=(`pyenv-hooks deactivate`)
 IFS="$OLDIFS"
 for script in "${scripts[@]}"; do source "$script"; done
 
-# Execute `before_deactivate` hooks.
-for hook in "${before_hooks[@]}"; do eval "$hook"; done
-
 while [ $# -gt 0 ]; do
   case "$1" in
   "-f" | "--force" )
@@ -78,6 +75,9 @@ else
   venv="${prefix##*/}"
 fi
 
+# Execute `before_deactivate` hooks.
+for hook in "${before_hooks[@]}"; do eval "$hook"; done
+
 if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then
   echo "pyenv-virtualenv: deactivate ${venv}" 1>&2
 fi