X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=2f7e05bab78d7854c05b7cfd87a90add4e8de835;hb=e1b60c59b8d885a5ce80788c1325cb6c12c6dd66;hp=333091c0c2cb837abd4ff16bcaa0bf55f948bb58;hpb=a349b130623707657fc99f512debf58d8a79cee0;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 333091c..2f7e05b 100644
--- a/.shellrc
+++ b/.shellrc
@@ -105,17 +105,45 @@ 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
+         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
+         return 124
+      }
+      complete -F _rsync_completion_loader r
+   fi
+
+   if has_completion ssh; then
+      _ssh_completion_loader() {
+         _completion_loader ssh
+         complete -F _ssh s
+         return 124
+      }
+      complete -F _ssh_completion_loader s
+   fi
+
    unset has_completion
 
    complete -A job bg fg j jobs wait
@@ -182,7 +210,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       _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
@@ -195,7 +223,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # completion for cdremote - list remotes with directories as URLs
       _cdremote_complete() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         _list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
          COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
          unset GIT_REMOTES
       }
@@ -205,7 +233,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # completion for git-open - list remotes with http(s) URLs
       _git_open() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
-         list_remotes '^http\(s\)\?://'
+         _list_remotes '^http\(s\)\?://'
          COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
          unset GIT_REMOTES
       }