X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.shellrc;h=044801b10974c82eb3fcef1afe04a628f847e017;hp=b0ba00f8576537101d93af2989958dd7aa73aec5;hb=bc64e79021fc792c18f18a989bc6079a679a7738;hpb=1b29d43fdccf916b864cfffefca4ae3c7ed018f1

diff --git a/.shellrc b/.shellrc
index b0ba00f..044801b 100644
--- a/.shellrc
+++ b/.shellrc
@@ -71,31 +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
-            . /etc/bash_completion.d/*
+            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
-            . /usr/local/etc/bash_completion.d/*
+            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 \
@@ -107,7 +113,7 @@ if test -n "$BASH_VERSION"; then
    for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 socat \
       telnet t tt \
       tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
-      whois wget wget-m wget-wrapper ww; do
+      whois wd wget wget-download wget-m wget-wrapper ww; do
          ! has_completion $cmd && complete -A hostname $cmd
    done
 
@@ -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
 
@@ -160,9 +166,14 @@ if test -n "$BASH_VERSION"; then
 
    source virtualenvwrapper_lazy.sh 2>/dev/null
 
-   #if [ -n "$VIRTUAL_ENV" ]; then
-   #   . "$VIRTUAL_ENV/bin/activate"
-   #fi
+   if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; 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 - "$@"; }
@@ -175,17 +186,66 @@ chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
 
 
 if test -x /usr/bin/git >/dev/null 2>&1; then
+   # chdir to a directory
+   cdgitpath() {
+      if [ $# -ne 1 ]; then
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      fi
+
+      path_key="$1"
+      if [ -z "$path_key" ]; then
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      fi
+
+      path_url="`git config --get --path $path_key`"
+      if echo "$path_url" | grep -q '^file:/'; then
+         path_url="`echo \"$path_url\" | sed 's@^file:/\+@/@'`"
+      fi
+      cd "$path_url"
+   }
+
    # chdir to a remote's directory (if the remote is on the local FS)
    cdremote() {
-      if [ -z "$1" -o -n "$2" ]; then
-         echo "Usage: cdremote remote_name" >&2
+      if [ $# -gt 1 ]; then
+         echo "Usage: cdremote [remote_name]" >&2
          return 1
       fi
-      cd "`git config --get remote.$1.url`"
+
+      if [ -z "$1" ]; then
+         branch="`git rev-parse --abbrev-ref HEAD`"
+         remote="`git config --get branch.$branch.remote`"
+      else
+         remote="$1"
+      fi
+
+      if [ -n "$remote" ] && git config --get remote.$remote.url | grep -q '^\(file:/\|/\|\.\./\)'; then
+         cdgitpath remote.$remote.url
+      else
+
+         if [ -n "$1" ]; then
+            echo "Cannot find directory for remote $1" >&2
+            echo "Usage: cdremote [remote_name]" >&2
+            return 1
+         fi
+
+         _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / 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
-      # completion for global aliases in .gitconfig
+      # completion for aliases in global .gitconfig
 
       # fixup rbi rbia rbiap rbip - do refs name completion
       _git_fixup() { __gitcomp_nl "$(__git_refs)" ; }
@@ -197,42 +257,59 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # push-to-all-remotes - do branch name completion
       _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; }
 
+      _cdgitpath_complete() {
+         local cword="${COMP_CWORD}" cur="${COMP_WORDS[COMP_CWORD]}";
+         COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`)
+      }
+
+      _git_open() {
+         _cdgitpath_complete
+      }
+
+      complete -F _cdgitpath_complete cdgitpath git-open
+
       # list remotes with URLs matching a regexp
       _list_remotes() {
-         if [ -z "$1" -o -n "$2" ]; then
+         if [ $# -ne 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
       }
 
-      # completion for cdremote and git-open - list remotes with a pattern
+      # completion for cdremote and git-open-remote - list remotes with a pattern
       _list_remotes_completion() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
          _list_remotes "$1"
-         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+         COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`)
          unset GIT_REMOTES
       }
 
       # completion for cdremote - list remotes with directories as URLs
       _cdremote_complete() {
-         _list_remotes_completion '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         _list_remotes_completion '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
+         if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+         fi
       }
 
       complete -F _cdremote_complete cdremote
 
-      # completion for git-open - list remotes with http(s) URLs
-      _git_open() {
+      # completion for git-open-remote - list remotes with http(s) URLs
+      _git_open_remote() {
          _list_remotes_completion '^http\(s\)\?://'
+         if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+         fi
       }
 
-      complete -F _git_open git-open
+      complete -F _git_open_remote git-open-remote
    fi
 fi
 
@@ -263,10 +340,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
@@ -318,9 +391,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
 }
@@ -355,7 +426,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; }