X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=9507b48ea3f6fb3ac02f56d2627a0db1a0aa5ed4;hb=3cff59920f9af586aea0fe9f9037168e38f2aaa2;hp=b4b4e05913aec791a56830ca7c01ba9b003a1c58;hpb=59e5881d91c20244b189a8899a02cd01bc127af3;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index b4b4e05..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; }
@@ -408,7 +413,7 @@ fi
 
 
 if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then
-   X() { startx >> .Xserver.log 2>&1; cyr; }
+   X() { startx >> .Xserver.log 2>&1; cyr; rm -f .Xauthority; }
 fi
 
 x() { exit; }