X-Git-Url: https://code.kerkeslager.com/?p=dotfiles;a=blobdiff_plain;f=.bashrc;h=578ecf2d12a10b5d9cf963bd7c6205fc553e75bd;hp=399963c117714636ca19b1f8a8a0f43a70e098da;hb=9f4e46b5d14eb8a540c7228078c54ab2fd836dc8;hpb=307e5de920cd74dc9d27e35a65aa47f3f8103c46

diff --git a/.bashrc b/.bashrc
index 399963c..578ecf2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -78,21 +78,30 @@ 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
+
 # Automatically open screen.
 # The if statement prevents it from recursing (since screen opens bash).
 if [ $TERM != screen ]; then
 	screen
 fi
 
-# Gets a directory named .env if it exists in the currend directory or any of its parents
+# Gets a directory named .env or .venv if it exists in the currend directory or any of its parents
 get_env() {
-    if [ -d "$1/.env" ] ; then
-        echo "$1/.env"
+  if [ -d "$1/.env" ] ; then
+    echo "$1/.env"
+  else
+    if [ -d "$1/.venv" ] ; then
+      echo "$1/.venv"
     else
-        if [ -d "$1/.." ] ; then
-            get_env "$1/.."
-        fi
+      if [ -d "$1/.." ] ; then
+        get_env "$1/.."
+      fi
     fi
+  fi
 }
 
 get_absolute_path() {
@@ -100,26 +109,26 @@ get_absolute_path() {
 }
 
 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 != $(get_absolute_path $env_folder) ]] ; then
-            echo "Activating env '$env_folder'"
-            source "$env_folder/bin/activate"
-        fi
-    else
-        if [ -d "$VIRTUAL_ENV" ] ; then
-            deactivate
-        fi
+  # 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 != $(get_absolute_path $env_folder) ]] ; then
+      echo "Activating env '$env_folder'"
+      source "$env_folder/bin/activate"
+    fi
+  else
+    if [ -d "$VIRTUAL_ENV" ] ; then
+      deactivate
     fi
+  fi
 }
 
-# Set vi keybindings
-set -o vi
-
 # Call on_prompt() every time the command prompt executes
 PROMPT_COMMAND=on_prompt
 
+# Set vi keybindings
+set -o vi
+
 # pip should only run if there is a virtualenv currently activated
 export PIP_REQUIRE_VIRTUALENV=true