diff --git a/virtualenvwrapper.sh b/virtualenvwrapper.sh index cf43626..edd9631 100644 --- a/virtualenvwrapper.sh +++ b/virtualenvwrapper.sh @@ -759,16 +759,14 @@ function workon { # before switching so we use our override function, # if it exists, but make sure it's the deactivate function # we set up - type deactivate >/dev/null 2>&1 - if [ $? -eq 0 ] - then + ! type deactivate >/dev/null 2>&1 || { typeset -f deactivate | grep 'typeset env_postdeactivate_hook' >/dev/null 2>&1 if [ $? -eq 0 ] then deactivate unset -f deactivate >/dev/null 2>&1 fi - fi + } virtualenvwrapper_run_hook "pre_activate" "$env_name"