X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=ff0e12710ff3fc9a9c74cf8083897a9f38d1fb53;hb=4eb7afb95caee040616c088d37e98135af8ceacf;hp=1b15d83ddc834e9e9dbc94c1dab2be441c5be99f;hpb=2fe998af793914f5c014bb7e732e7ed1b47c678a;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 1b15d83..ff0e127 100644
--- a/.shellrc
+++ b/.shellrc
@@ -76,11 +76,15 @@ if test -n "$BASH_VERSION"; then
          if [ -f /etc/bash_completion ]; then
             . /etc/bash_completion
          elif [ -d /etc/bash_completion.d ]; then
-            . /etc/bash_completion.d/*
+            for _compf in /etc/bash_completion.d/*; do
+               . $_compf
+            done
          fi
       elif [ "$SHELL" = /usr/local/bin/bash ]; then
          if [ -d /usr/local/etc/bash_completion.d ]; then
-            . /usr/local/etc/bash_completion.d/*
+            for _compf in /usr/local/etc/bash_completion.d/*; do
+               . $_compf
+            done
          fi
       else
          echo "Unknown OS type, cannot source bash_completion" >&2
@@ -177,11 +181,23 @@ chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
 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 [ -z "$1" -o -n "$2" ]; then
-         echo "Usage: cdremote remote_name" >&2
+      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
-      cd "`git config --get remote.$1.url`"
+
+      if [ -z "$remote" ]; then
+         echo "Cannot find remote for branch $branch" >&2
+         echo "Usage: cdremote [remote_name]" >&2
+         return 1
+      fi
+
+      cd "`git config --get remote.$remote.url`"
    }
 
    if test -n "$BASH_VERSION"; then