.profile, .shellrc: test $BASH_VERSION instead of $SHELL

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 8adc256b252b15555dfcd0c60ababafd72511d6a..5975ab3a7f4ab27cd2002f40839f4bc7d4d12c77 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -12,6 +12,9 @@ case $- in
       *) return;;
 esac
 
+# Stop if non-interactive shell
+# [ -z "$PS1" ] && return
+
 # append to the history file, don't overwrite it
 shopt -s histappend
 
@@ -54,8 +57,7 @@ OPS1="$OPS1\\$"
 PS1="$OPS1 "
 
 
-case "$SHELL" in
-*/bash)
+if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
    [ "`type -t mc`" = alias ] && unalias mc
@@ -119,19 +121,19 @@ case "$SHELL" in
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
 
-   which pip >/dev/null 2>&1 && eval "`pip completion --bash`"
-   ;;
+   if which pip >/dev/null 2>&1; then
+      eval "`pip completion --bash`"
+      rm -rf /tmp/pip_build_"$USER"
+   fi
 
-*/ksh)
+elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - ${1:+"$@"}; }
    clo() { clear; exit; }
    j() { jobs; }
-   ;;
 
-*/sh)
+else
    clo() { clear; exit; }
-   ;;
-esac
+fi
 
 
 # clear history, clear screen and logout
@@ -158,12 +160,51 @@ KillAll() {
 }
 
 
-x() { exit; }
-X() { startx >> .Xserver.log 2>&1; cyr; }
+# git-related
+
+# chdir to a remote's directory (if the remote is on the local FS)
+cdremote() {
+   cd "`git config --get remote.$1.url`"
+}
+
+if test -n "$BASH_VERSION"; then
+   # list remotes with URLs matching a regexp
+   list_remotes() {
+      GIT_REMOTES=""
+      for remote in `git remote`; do
+         if git config --get remote.$remote.url | grep -q "$1"; then
+            GIT_REMOTES="$GIT_REMOTES $remote"
+         fi
+      done
+      remote=""
+      unset remote
+   }
+
+   # completion for cdremote - list remotes with directories as URLs
+   _cdremote_complete() {
+      local cur="${COMP_WORDS[COMP_CWORD]}";
+      list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+      COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+      GIT_REMOTES=""
+      unset GIT_REMOTES
+   }
+
+   complete -F _cdremote_complete cdremote
+
+   # completion for git-open - list remotes with http(s) URLs
+   _git_open() {
+      local cur="${COMP_WORDS[COMP_CWORD]}";
+      list_remotes '^http\(s\)\?://'
+      COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+      GIT_REMOTES=""
+      unset GIT_REMOTES
+   }
+
+   complete -F _git_open git-open
+fi
 
 
-include()
-{
+include() {
    cfg="$1"
    if [ -f "./$cfg" -a -r "./$cfg" ]; then
       echo "Reading config file \`$cfg'" 1>&2
@@ -178,12 +219,10 @@ include()
 
 
 mc() {
-   case "$SHELL" in
-      */bash)
-         MC_SAVE_OPS1="$OPS1"
-         OPS1="\u@\h "
-      ;;
-   esac
+   if test -n "$BASH_VERSION"; then
+      MC_SAVE_OPS1="$OPS1"
+      OPS1="\u@\h "
+   fi
 
    if [ -n "$SLOWTERM" ]; then
       MC_SLOW="--slow"
@@ -284,6 +323,11 @@ if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then
    source /usr/local/bin/virtualenvwrapper_lazy.sh
 fi
 
-if which pyenv >/dev/null 2>&1; then
-   eval "`pyenv init -`"
-fi
+#if which pyenv >/dev/null 2>&1; then
+#   eval "`pyenv init -`"
+#   eval "`pyenv virtualenv-init -`"
+#fi
+
+
+X() { startx >> .Xserver.log 2>&1; cyr; }
+x() { exit; }