X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=9507b48ea3f6fb3ac02f56d2627a0db1a0aa5ed4;hb=28f1d0428362ae11d5c3cae5a2df2bc960872c07;hp=0cfd207e9cf22601f7ea0de7d66b421c2073b5f5;hpb=442bb340cd83587f565c05cb576c9ea186131923;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 0cfd207..9507b48 100644
--- a/.shellrc
+++ b/.shellrc
@@ -74,7 +74,7 @@ if test -n "$BASH_VERSION"; then
    has_completion() { return 0; }
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
       if [ "$SHELL" = /bin/bash ]; then
-         if [ -d /usr/share/bash_completion ]; then
+         if [ -d /usr/share/bash-completion ]; then
             . /usr/share/bash-completion/bash_completion
             has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; }
          elif [ -f /etc/bash_completion ]; then
@@ -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; }