X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=8e0f9292a8a68963a4e3eb836c44c77e0458cefb;hb=8c5aba677b6b6d5fe66a696f17e5dadec73b7099;hp=d9c4badb1c93e3fbb7e58017b884b95feb7270c3;hpb=1decc13ba58c32545eef28b695083f4c697ba87d;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index d9c4bad..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
          }"
@@ -199,7 +199,11 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          return 1
       fi
 
-      cd "`git config --get --path $path_key`"
+      path_url="`git config --get --path $path_key`"
+      if echo "$path_url" | grep -q '^file:/'; then
+         path_url="`echo \"$path_url\" | sed 's@^file:/\+@/@'`"
+      fi
+      cd "$path_url"
    }
 
    # chdir to a remote's directory (if the remote is on the local FS)
@@ -216,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 '^\(/\|\.\./\)'; then
+      if [ -n "$remote" ] && git config --get remote.$remote.url |
+            grep -q '^\(file:/\|/\|\.\./\)'; then
          cdgitpath remote.$remote.url
       else
 
@@ -232,7 +231,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
             return 1
          fi
 
-         _list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
          if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
             remote=${GIT_REMOTES[0]}
             unset GIT_REMOTES
@@ -272,7 +271,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
 
       # list remotes with URLs matching a regexp
       _list_remotes() {
-         if [ $#  -ne 1 ]; then
+         if [ $# -ne 1 ]; then
             echo "Usage: _list_remotes remote_regexp" >&2
             return 1
          fi
@@ -295,7 +294,7 @@ 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)
+         _list_remotes_completion '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
          if [ ${#COMPREPLY[*]} -eq 0 ]; then
             _list_remotes_completion .
          fi