X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=a78a8e1efabecf156f72581d30dbfc8105d18143;hb=91442e415ce67dd496a561848d312dca19675c8e;hp=1920ed7cc94ddc04b34ea6cc17341ef70f1a4865;hpb=816aeef09e1ad1ee6db5b51bcb5f0642a8b53235;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 1920ed7..a78a8e1 100644
--- a/.shellrc
+++ b/.shellrc
@@ -113,13 +113,13 @@ 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
 
    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;
+         ! has_completion $cmd && complete -o default -A hostname $cmd
    done
 
    delegate_completion() {
@@ -130,7 +130,7 @@ if test -n "$BASH_VERSION"; then
          programs="$@"
          eval "_${prog}_completion_loader() {
             _completion_loader $prog
-            complete -F _$prog $programs
+            complete -o nospace -F _$prog $programs
             unset _${prog}_completion_loader
             return 124
          }"
@@ -220,13 +220,8 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          remote="$1"
       fi
 
-      if [ -z "$remote" ]; then
-         echo "Cannot find remote for branch $branch" >&2
-         echo "Usage: cdremote [remote_name]" >&2
-         return 1
-      fi
-
-      if git config --get remote.$remote.url | grep -q '^\(file:/\|/\|\.\./\)'; then
+      if [ -n "$remote" ] && git config --get remote.$remote.url |
+            grep -q '^\(file:/\|/\|\.\./\)'; then
          cdgitpath remote.$remote.url
       else
 
@@ -264,7 +259,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; }
 
       _cdgitpath_complete() {
-         local cword="${COMP_CWORD}" cur="${COMP_WORDS[COMP_CWORD]}";
+         local cur="${COMP_WORDS[COMP_CWORD]}"
          COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`)
       }
 
@@ -291,7 +286,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
 
       # completion for cdremote and git-open-remote - list remotes with a pattern
       _list_remotes_completion() {
-         local cur="${COMP_WORDS[COMP_CWORD]}";
+         local cur="${COMP_WORDS[COMP_CWORD]}"
          _list_remotes "$1"
          COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`)
          unset GIT_REMOTES