X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.shellrc;h=16102b4a447be53bb3dd29196dc89270a6fe5f75;hp=2162d3b5164c77f7f430b824437a5dd3a31774b9;hb=3c555a44022fd52fa8bbdd629fcfbff222ed800e;hpb=bb774a1a3b907df994f1e473e6a5e0dd3daf4c86

diff --git a/.shellrc b/.shellrc
index 2162d3b..16102b4 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
          }"
@@ -188,40 +188,40 @@ chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
 if test -x /usr/bin/git >/dev/null 2>&1; then
    # chdir to a directory
    cdgitpath() {
-      if [ -z "$1" -o -n "$2" ]; then
+      if [ $# -ne 1 ]; then
          echo "Usage: cdgitpath path_key" >&2
          return 1
-      else
-         path_key="$1"
       fi
 
+      path_key="$1"
       if [ -z "$path_key" ]; then
          echo "Usage: cdgitpath path_key" >&2
          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)
    cdremote() {
+      if [ $# -gt 1 ]; then
+         echo "Usage: cdremote [remote_name]" >&2
+         return 1
+      fi
+
       if [ -z "$1" ]; then
          branch="`git rev-parse --abbrev-ref HEAD`"
          remote="`git config --get branch.$branch.remote`"
-      elif [ -n "$2" ]; then
-         echo "Usage: cdremote [remote_name]" >&2
-         return 1
       else
          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 # (file:/ or / or ../ at the beginning)
          cdgitpath remote.$remote.url
       else
 
@@ -231,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
@@ -258,15 +258,8 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # push-to-all-remotes - do branch name completion
       _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; }
 
-      _cdgitpath_completion_loader() {
-         _completion_loader git
-         complete -F _cdgitpath_complete cdgitpath git-open
-         unset _cdgitpath_completion_loader
-         return 124
-      }
-
       _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"`)
       }
 
@@ -274,11 +267,11 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          _cdgitpath_complete
       }
 
-      complete -F _cdgitpath_completion_loader cdgitpath git-open
+      complete -F _cdgitpath_complete cdgitpath git-open
 
       # list remotes with URLs matching a regexp
       _list_remotes() {
-         if [ -z "$1" -o -n "$2" ]; then
+         if [ $# -ne 1 ]; then
             echo "Usage: _list_remotes remote_regexp" >&2
             return 1
          fi
@@ -293,15 +286,15 @@ 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"`)
+         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)
+         _list_remotes_completion '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
          if [ ${#COMPREPLY[*]} -eq 0 ]; then
             _list_remotes_completion .
          fi