X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=ff0e12710ff3fc9a9c74cf8083897a9f38d1fb53;hb=d52d4f55d7e23107bb2a070f3407aa3eebbb4542;hp=b0ba00f8576537101d93af2989958dd7aa73aec5;hpb=1b29d43fdccf916b864cfffefca4ae3c7ed018f1;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index b0ba00f..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
@@ -160,9 +164,9 @@ if test -n "$BASH_VERSION"; then
 
    source virtualenvwrapper_lazy.sh 2>/dev/null
 
-   #if [ -n "$VIRTUAL_ENV" ]; then
-   #   . "$VIRTUAL_ENV/bin/activate"
-   #fi
+   if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then
+      . "$VIRTUAL_ENV/bin/activate"
+   fi
 
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - "$@"; }
@@ -177,15 +181,27 @@ 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
-      # completion for global aliases in .gitconfig
+      # completion for aliases in global .gitconfig
 
       # fixup rbi rbia rbiap rbip - do refs name completion
       _git_fixup() { __gitcomp_nl "$(__git_refs)" ; }