X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=9cee28309e4200258628c5406fc220bb11b4eac5;hb=a3f51e2b4e6e0c32f94e09ea9698194392dbc264;hp=bd1228e0d3a2caa4ec101307e34917d40c51ead5;hpb=9aca2212d4f0f30950d273f84f702e9ff0a098cc;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index bd1228e..9cee283 100644
--- a/.shellrc
+++ b/.shellrc
@@ -105,17 +105,48 @@ if test -n "$BASH_VERSION"; then
          ! has_completion $cmd && complete -o default -A command $cmd
    done
 
-   for cmd in dig host nslookup nc netcat nmap p ping ping6 socat \
+   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
          ! has_completion $cmd && complete -A hostname $cmd
    done
 
+   if has_completion wget; then
+      _wget_completion_loader() {
+         _completion_loader wget
+         complete -F _wget wget-m wget-wrapper ww
+         unset _wget_completion_loader
+         return 124
+      }
+      complete -F _wget_completion_loader wget-m wget-wrapper ww
+   fi
+
    for cmd in distribute ftp lftp r rsync \
       s scp ssh smbclient tcpdump tshark wireshark; do
          ! has_completion $cmd && complete -o default -A hostname $cmd;
    done
+
+   if has_completion rsync; then
+      _rsync_completion_loader() {
+         _completion_loader rsync
+         complete -F _rsync r
+         unset _rsync_completion_loader
+         return 124
+      }
+      complete -F _rsync_completion_loader r
+   fi
+
+   if has_completion ssh; then
+      _ssh_completion_loader() {
+         _completion_loader ssh
+         complete -F _ssh s
+         unset _ssh_completion_loader
+         return 124
+      }
+      complete -F _ssh_completion_loader s
+   fi
+
    unset has_completion
 
    complete -A job bg fg j jobs wait
@@ -172,8 +203,17 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
    }
 
    if test -n "$BASH_VERSION"; then
+      # completion for global aliases in .gitconfig
+      # fixup rbi rbia rbiap rbip - delegate to git-rebase completion
+
+      _git_fixup() { _git_rebase ; }
+      _git_rbi() { _git_rebase ; }
+      _git_rbia() { _git_rebase ; }
+      _git_rbiap() { _git_rebase ; }
+      _git_rbip() { _git_rebase ; }
+
       # list remotes with URLs matching a regexp
-      list_remotes() {
+      _list_remotes() {
          GIT_REMOTES=""
          local remote
          for remote in `git remote`; do
@@ -183,22 +223,24 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          done
       }
 
-      # completion for cdremote - list remotes with directories as URLs
-      _cdremote_complete() {
+      # completion for cdremote and git-open - list remotes with a pattern
+      _list_remotes_completion() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         _list_remotes "$1"
          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)
+      }
+
       complete -F _cdremote_complete cdremote
 
       # completion for git-open - list remotes with http(s) URLs
       _git_open() {
-         local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^http\(s\)\?://'
-         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
-         unset GIT_REMOTES
+         _list_remotes_completion '^http\(s\)\?://'
       }
 
       complete -F _git_open git-open