X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=d9c4badb1c93e3fbb7e58017b884b95feb7270c3;hb=1decc13ba58c32545eef28b695083f4c697ba87d;hp=112fa4422eb59ef2c2c7f4d1358bf4aa66c7b382;hpb=658792891f015902124dbf8601c541fd3959ca3e;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 112fa44..d9c4bad 100644
--- a/.shellrc
+++ b/.shellrc
@@ -188,13 +188,12 @@ 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
@@ -205,12 +204,14 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
 
    # 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
@@ -225,6 +226,12 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          cdgitpath remote.$remote.url
       else
 
+         if [ -n "$1" ]; then
+            echo "Cannot find directory for remote $1" >&2
+            echo "Usage: cdremote [remote_name]" >&2
+            return 1
+         fi
+
          _list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
          if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
             remote=${GIT_REMOTES[0]}
@@ -252,13 +259,6 @@ 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]}";
          COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`)
@@ -268,11 +268,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
@@ -289,7 +289,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       _list_remotes_completion() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
          _list_remotes "$1"
-         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+         COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`)
          unset GIT_REMOTES
       }