X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=af5408c81420d3d997e0b6afdd6fc28a7da74e18;hb=23520d25323173ac8d8bac0b1aba6165c4a34997;hp=b4b4e05913aec791a56830ca7c01ba9b003a1c58;hpb=59e5881d91c20244b189a8899a02cd01bc127af3;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index b4b4e05..af5408c 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
@@ -98,6 +98,12 @@ if test -n "$BASH_VERSION"; then
       fi
    fi
 
+   if [ -d "$HOME"/.bash_completion.d ]; then
+      for _compf in "$HOME"/.bash_completion.d/*; do
+         . $_compf
+      done
+   fi
+
    for cmd in builtin cgmem_nice command dbus-launch exec \
       killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo \
       time whence whereis which xargs; do
@@ -134,7 +140,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 +170,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 +419,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; }