From: Oleg Broytman Date: Wed, 30 Jan 2019 23:14:52 +0000 (+0300) Subject: .bash_logout, .shellrc: Deactivate virtual environment on exit X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;ds=sidebyside;h=11ef0596b5746e9490671869db702a1e9945ab58;p=dotfiles.git .bash_logout, .shellrc: Deactivate virtual environment on exit Deactivate python virtual environment on exit from any shell, not only login shell. --- diff --git a/.bash_logout b/.bash_logout index ccd81db..ee262d2 100644 --- a/.bash_logout +++ b/.bash_logout @@ -1,10 +1,5 @@ # ~/.bash_logout: executed by bash(1) when login shell exits. -# Clean up python virtual environment on exit -# See https://virtualenvwrapper.readthedocs.io/en/latest/tips.html#clean-up-environments-on-exit - -[ "$VIRTUAL_ENV" ] && deactivate - # when leaving the console clear the screen to increase privacy if [ "$SHLVL" = 1 ]; then diff --git a/.shellrc b/.shellrc index ff08941..9507b48 100644 --- a/.shellrc +++ b/.shellrc @@ -164,6 +164,11 @@ if test -n "$BASH_VERSION"; then . "$VIRTUAL_ENV/bin/activate" fi + # Clean up python virtual environment on exit + # See https://virtualenvwrapper.readthedocs.io/en/latest/tips.html#clean-up-environments-on-exit + + trap '[ "$VIRTUAL_ENV" ] && deactivate' EXIT + elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then back() { cd - "$@"; } j() { jobs; }