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

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index acb5c52d707ff4c9fd75d448a630f7aa71999744..5975ab3a7f4ab27cd2002f40839f4bc7d4d12c77 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -2,8 +2,43 @@
 # $HOME/.shellrc
 #
 
-OPS1="$OPS1\\$"
-PS1="$OPS1 "
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# Stop if non-interactive shell
+# [ -z "$PS1" ] && return
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+
+#if [ -x /usr/bin/dircolors ]; then
+   # I don't like these aliases - they work only in command line
+   # but not in scripts I run from command line.
+   # Color parameters must be passed via environment.
+   #alias ls='ls --color=auto'
+   #alias dir='dir --color=auto'
+   #alias vdir='vdir --color=auto'
+
+   #alias grep='grep --color=auto'
+   #alias fgrep='fgrep --color=auto'
+   #alias egrep='egrep --color=auto'
+#fi
 
 
 case "$HOME" in
@@ -17,8 +52,12 @@ case "$HOME" in
    ;;
 esac
 
-case "$SHELL" in
-*/bash)
+
+OPS1="$OPS1\\$"
+PS1="$OPS1 "
+
+
+if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
    [ "`type -t mc`" = alias ] && unalias mc
@@ -72,6 +111,7 @@ case "$SHELL" in
       s scp ssh smbclient tcpdump tshark wireshark; do
          ! has_completion $cmd && complete -o default -A hostname $cmd;
    done
+   unset has_completion
 
    complete -A job bg fg j jobs wait
    complete -A variable unset
@@ -80,18 +120,20 @@ case "$SHELL" in
       complete -W "`cd \"$HOME/lib/config\" && echo *`" include
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
-   ;;
 
-*/ksh)
+   if which pip >/dev/null 2>&1; then
+      eval "`pip completion --bash`"
+      rm -rf /tmp/pip_build_"$USER"
+   fi
+
+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
@@ -118,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`"
+}
 
-include()
-{
+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() {
    cfg="$1"
    if [ -f "./$cfg" -a -r "./$cfg" ]; then
       echo "Reading config file \`$cfg'" 1>&2
@@ -138,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"
@@ -238,3 +317,17 @@ tmux() {
       ;;
    esac
 }
+
+
+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 -`"
+#   eval "`pyenv virtualenv-init -`"
+#fi
+
+
+X() { startx >> .Xserver.log 2>&1; cyr; }
+x() { exit; }