.gitconfig: copied some aliases from gitalias.com

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index e70784befeca0d18c725eba23c2561417815cd70..a908dd953ad50d9ff3c1d6104ecb1031af328cbe 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,6 +52,11 @@ case "$HOME" in
    ;;
 esac
 
+
+OPS1="$OPS1\\$"
+PS1="$OPS1 "
+
+
 case "$SHELL" in
 */bash)
    [ "`type -t ls`" = alias ] && unalias ls
@@ -82,7 +122,10 @@ 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)
@@ -241,3 +284,13 @@ 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