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

diff --git a/.shellrc b/.shellrc
index 1920ed7..8e0f929 100644
--- a/.shellrc
+++ b/.shellrc
@@ -113,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
 
@@ -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