X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;ds=sidebyside;f=.bashrc;h=399963c117714636ca19b1f8a8a0f43a70e098da;hb=0b151af2dde58b3876b58690b8501cc8d3d5b832;hp=b79d1ed282988809a8d09a2e3cb2d122c1f5d1c0;hpb=6666d1e22a2ef19d5909f109eed5ab1b0fb6b51e;p=dotfiles

diff --git a/.bashrc b/.bashrc
index b79d1ed..399963c 100644
--- 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
@@ -98,12 +95,16 @@ get_env() {
     fi
 }
 
+get_absolute_path() {
+  python3 -c "import os; print(os.path.realpath('$1'))"
+}
+
 on_prompt() {
     # Load a virtualenv environment if it exists in a file named .env
     env_folder=$(get_env $(pwd))
 
     if [ -d "$env_folder" ] ; then
-        if [[ $VIRTUAL_ENV != $env_folder ]] ; then
+      if [[ $VIRTUAL_ENV != $(get_absolute_path $env_folder) ]] ; then
             echo "Activating env '$env_folder'"
             source "$env_folder/bin/activate"
         fi
@@ -120,3 +121,5 @@ 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