Prevent pip from running if there isn't a virtualenv

[dotfiles] / .bashrc

diff --git a/.bashrc b/.bashrc
index fad15ea..a8ebce5 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,7 +1,10 @@
 # ~/.bashrc: executed by bash(1) for non-login shells.
 
 # If not running interactively, don't do anything
-[ -z "$PS1" ] && return
+case $- in
+    *i*) ;;
+      *) return;;
+esac
 
 # don't put duplicate lines in the history. See bash(1) for more options
 # don't overwrite GNU Midnight Commander's setting of `ignorespace'.
@@ -24,6 +27,11 @@ shopt -s checkwinsize
 # set the prompt
 PS1='\w\$ '
 
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     eval "`dircolors -b`"
@@ -38,6 +46,8 @@ fi
 
 alias emacs='emacs -nw'
 alias serve='python -m SimpleHTTPServer 8080'
+alias gpg='gpg2'
+alias gnupg='gnupg2'
 
 export SVN_EDITOR=vim
 
@@ -68,19 +78,6 @@ fi
 PATH="/usr/local/bin:$PATH"
 export PATH
 
-# Run a machine-specific bashrc (if it exists).
-if [ -f $HOME/.bashrc_local ]; then
-       source $HOME/.bashrc_local
-fi
-
-# Install RVM if it's not installed.
-if [ ! -f $HOME/.rvm/scripts/rvm ]; then
-    bash -s stable < <(curl -s https://raw.github.com/wayneeseguin/rvm/master/binscripts/rvm-installer )
-fi
-
-# Load RVM into shell session.
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"
-
 # Automatically open screen.
 # The if statement prevents it from recursing (since screen opens bash).
 if [ $TERM != screen ]; then
@@ -114,5 +111,11 @@ on_prompt() {
     fi
 }
 
+# Set vi keybindings
+set -o vi
+
 # Call on_prompt() every time the command prompt executes
 PROMPT_COMMAND=on_prompt
+
+# pip should only run if there is a virtualenv currently activated
+export PIP_REQUIRE_VIRTUALENV=true