Merge branch 'master' of git://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles

Conflicts:
	.bashrc
	.profile

1 files changed, 16 insertions, 6 deletions

diff --git a/.profile b/.profile
index 6e42583..0bb55ca 100644
--- a/.profile
+++ b/.profile
@@ -22,12 +22,10 @@ for dir in $HOME/.prefix/lib; do
     fi
 done
 
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-        . "$HOME/.bashrc"
-    fi
+if [ -d "$HOME/tmp" ]; then
+    export TMPDIR="$HOME/tmp"
+elif [ -d "$HOME/.prefix/tmp"]; then
+    export TMPDIR="$HOME/.prefix/tmp"
 fi
 
 # set SELECTED_EDITOR, EDITOR, and VISUAL to set the text editor used
@@ -39,6 +37,18 @@ if [ -f "$HOME/.selected_editor" ]; then
     export VISUAL="${VISUAL:-$SELECTED_EDITOR}"
 fi
 
+if [ -f "$HOME/.login-daemons" ]; then
+    . "$HOME/.login-daemons"
+fi
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+    # include .bashrc if it exists
+    if [ -f "$HOME/.bashrc" ]; then
+        . "$HOME/.bashrc"
+    fi
+fi
+
 if [ -x "`which alsactl`" ]; then
     alsactl --file $HOME/.alsa.save restore &> /dev/null || true
 fi