.vim/plugin/tmpwatch.vim: echo -> echoerr

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index ff089415d0369a3b135b17ab5f2a73b133d22327..051889d2a64e80a1ceded88d457126f8081809cf 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -134,7 +134,7 @@ if test -n "$BASH_VERSION"; then
 
    delegate_completion make m
    delegate_completion ping p
-   delegate_completion rsync r
+   delegate_completion rsync r rsync_cgmn rsync_cgmn_recode
    delegate_completion ssh s
    delegate_completion wget wget-m wget-wrapper ww
 
@@ -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; }