X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=112fa4422eb59ef2c2c7f4d1358bf4aa66c7b382;hb=658792891f015902124dbf8601c541fd3959ca3e;hp=7fd9393c9fa45cc25344a873349bedf0207cfb25;hpb=7597ba385417b725206e3f83f44d645e87e945d0;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 7fd9393..112fa44 100644
--- a/.shellrc
+++ b/.shellrc
@@ -71,35 +71,37 @@ if test -n "$BASH_VERSION"; then
    functions() { typeset -f "$@"; }
    j() { jobs; }
 
+   has_completion() { return 0; }
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
       if [ "$SHELL" = /bin/bash ]; then
-         if [ -f /etc/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
             . /etc/bash_completion
+            has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
          elif [ -d /etc/bash_completion.d ]; then
             for _compf in /etc/bash_completion.d/*; do
                . $_compf
             done
+            has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
          fi
       elif [ "$SHELL" = /usr/local/bin/bash ]; then
          if [ -d /usr/local/etc/bash_completion.d ]; then
             for _compf in /usr/local/etc/bash_completion.d/*; do
                . $_compf
             done
+            has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
          fi
       else
          echo "Unknown OS type, cannot source bash_completion" >&2
       fi
    fi
 
-   has_completion() { return 0; }
-   if [ "$SHELL" = /bin/bash ]; then
-      if [ -d /etc/bash_completion.d -o -d /usr/share/bash-completion/completions ]; then
-         has_completion() { [ -r /etc/bash_completion.d/$1 -o -r /usr/share/bash-completion/completions/$1 ]; }
-      fi
-   elif [ "$SHELL" = /usr/local/bin/bash ]; then
-      if [ -d /usr/local/etc/bash_completion.d ]; then
-         has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
-      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 \
@@ -138,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
 
@@ -168,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; }
@@ -214,7 +221,22 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          return 1
       fi
 
-      cdgitpath remote.$remote.url
+      if git config --get remote.$remote.url | grep -q '^\(/\|\.\./\)'; then
+         cdgitpath remote.$remote.url
+      else
+
+         _list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
+            remote=${GIT_REMOTES[0]}
+            unset GIT_REMOTES
+            cdgitpath remote.$remote.url
+         else
+            unset GIT_REMOTES
+            echo "Cannot find directory for any remote" >&2
+            echo "Usage: cdremote [remote_name]" >&2
+            return 1
+         fi
+      fi
    }
 
    if test -n "$BASH_VERSION"; then
@@ -254,11 +276,11 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
             echo "Usage: _list_remotes remote_regexp" >&2
             return 1
          fi
-         GIT_REMOTES=""
+         declare -ag GIT_REMOTES=()
          local remote
          for remote in `git remote`; do
             if git config --get remote.$remote.url | grep -q "$1"; then
-               GIT_REMOTES="$GIT_REMOTES $remote"
+               GIT_REMOTES+=($remote)
             fi
          done
       }
@@ -320,10 +342,6 @@ mc() {
 
    case "$TERM" in
       screen*) # screen, screen.rxvt
-         if [ "$TERM" = screen.rxvt ]; then
-            MC_SAVE_TERM="$TERM"
-            TERM=rxvt
-         fi
          MC_XTERM="-x"
       ;;
    esac
@@ -375,9 +393,7 @@ mc() {
    fi
 
    [ -n "$MC_SAVE_OPS1" ] && OPS1="$MC_SAVE_OPS1"
-   [ -n "$MC_SAVE_TERM" ] && TERM="$MC_SAVE_TERM"
-   unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SAVE_TERM \
-         MC_SLOW MC_TMP_DIR MC_XTERM
+   unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SLOW MC_TMP_DIR MC_XTERM
 
    return $rc
 }
@@ -412,7 +428,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; }