X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=7fd9393c9fa45cc25344a873349bedf0207cfb25;hb=3480c7ccf9418a0d612e8ddb4aa51f5ba325d965;hp=f62347b22db131518052f1767e242e62f7851abb;hpb=9169df51588c4172babd3233ca28ed01b0f6ef92;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index f62347b..7fd9393 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 - "$@"; }
@@ -175,13 +179,42 @@ 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
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      else
+         path_key="$1"
+      fi
+
+      if [ -z "$path_key" ]; then
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      fi
+
+      cd "`git config --get --path $path_key`"
+   }
+
    # 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
+
+      cdgitpath remote.$remote.url
    }
 
    if test -n "$BASH_VERSION"; then
@@ -197,6 +230,24 @@ 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"`)
+      }
+
+      _git_open() {
+         _cdgitpath_complete
+      }
+
+      complete -F _cdgitpath_completion_loader cdgitpath git-open
+
       # list remotes with URLs matching a regexp
       _list_remotes() {
          if [ -z "$1" -o -n "$2" ]; then
@@ -212,7 +263,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          done
       }
 
-      # completion for cdremote and git-open - list remotes with a pattern
+      # completion for cdremote and git-open-remote - list remotes with a pattern
       _list_remotes_completion() {
          local cur="${COMP_WORDS[COMP_CWORD]}";
          _list_remotes "$1"
@@ -223,16 +274,22 @@ 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)
+         if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+         fi
       }
 
       complete -F _cdremote_complete cdremote
 
-      # completion for git-open - list remotes with http(s) URLs
-      _git_open() {
+      # completion for git-open-remote - list remotes with http(s) URLs
+      _git_open_remote() {
          _list_remotes_completion '^http\(s\)\?://'
+         if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+         fi
       }
 
-      complete -F _git_open git-open
+      complete -F _git_open_remote git-open-remote
    fi
 fi