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

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index ff0e12710ff3fc9a9c74cf8083897a9f38d1fb53..051889d2a64e80a1ceded88d457126f8081809cf 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -71,37 +71,33 @@ 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
-   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
@@ -138,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
 
@@ -168,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; }
@@ -179,6 +180,23 @@ 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 [ -z "$1" -o -n "$2" ]; then
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      else
+         path_key="$1"
+      fi
+
+      if [ -z "$path_key" ]; then
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      fi
+
+      cd "`git config --get --path $path_key`"
+   }
+
    # chdir to a remote's directory (if the remote is on the local FS)
    cdremote() {
       if [ -z "$1" ]; then
@@ -197,7 +215,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          return 1
       fi
 
-      cd "`git config --get remote.$remote.url`"
+      cdgitpath remote.$remote.url
    }
 
    if test -n "$BASH_VERSION"; then
@@ -213,6 +231,24 @@ 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_completion_loader() {
+         _completion_loader git
+         complete -F _cdgitpath_complete cdgitpath git-open
+         unset _cdgitpath_completion_loader
+         return 124
+      }
+
+      _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_completion_loader cdgitpath git-open
+
       # list remotes with URLs matching a regexp
       _list_remotes() {
          if [ -z "$1" -o -n "$2" ]; then
@@ -228,7 +264,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          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"
@@ -239,16 +275,22 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # completion for cdremote - list remotes with directories as URLs
       _cdremote_complete() {
          _list_remotes_completion '^\(/\|\.\./\)' # (/ 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
 
@@ -371,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; }