X-Git-Url: https://code.kerkeslager.com/?a=blobdiff_plain;ds=sidebyside;f=.bashrc;h=08021f5545d4d698f34f6c8cb708e98145b07607;hb=209b533f3d5f9ee5ed2aafa5d0eccb21fdc6a514;hp=d33a38db19754697b2ebe38f004171e0dfa97adf;hpb=bfe295810bb6e3d2a048bf8f27575bc84e9863a3;p=dotfiles

diff --git a/.bashrc b/.bashrc
index d33a38d..08021f5 100644
--- a/.bashrc
+++ b/.bashrc
@@ -55,6 +55,13 @@ if [ -d $HOME/bin ]; then
 	export PATH
 fi
 
+# Put $HOME/Library/Haskell/bin on the path. Installing cabal doesn't
+# automatically put installed packages on the path.
+if [ -d $HOME/Library/Haskell/bin ]; then
+    PATH="$HOME/Library/Haskell/bin:$PATH"
+    export PATH
+fi
+
 # Put /usr/local/bin (where homebrew installs stuff) before /usr/bin on the
 # path. This means that if a program exists at both locations, calls to that
 # program will use the homebrew version rather than the system version.
@@ -79,3 +86,33 @@ fi
 if [ $TERM != screen ]; then
 	screen
 fi
+
+# Gets a directory named .env if it exists in the currend directory or any of its parents
+get_env() {
+    if [ -d "$1/.env" ] ; then
+        echo "$1/.env"
+    else
+        if [ -d "$1/.." ] ; then
+            get_env "$1/.."
+        fi
+    fi
+}
+
+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
+            echo "Activating env '$env_folder'"
+            source "$env_folder/bin/activate"
+        fi
+    else
+        if [ -d "$VIRTUAL_ENV" ] ; then
+            deactivate
+        fi
+    fi
+}
+
+# Call on_prompt() every time the command prompt executes
+PROMPT_COMMAND=on_prompt