diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-16 16:20:12 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-16 16:20:12 -0500 |
| commit | 1111923a0f8daf24984e13bc1da2295c4e16157c (patch) | |
| tree | efb18952f2e05c9131250a08e3bea2ab177d8635 /.bashrc | |
| parent | a7f367af4201eee04dd34a008c4299cd82c02d0a (diff) | |
| parent | 86e56415e8c8081c99b99209182a6b5b34361d74 (diff) | |
Merge branch 'master' of git://gitorious.org/lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.bashrc
.profile
Diffstat (limited to '.bashrc')
| -rw-r--r-- | .bashrc | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -96,12 +96,7 @@ if [ -f /etc/bash_completion ]; then . /etc/bash_completion fi -if [ "$TERM" != dumb ]; then - if [ -d "$HOME/tmp" ]; then - export TMPDIR="$HOME/tmp" - fi - daemon emacs --daemon - daemon sysfiles - daemon maildirproc +if [ -f "$HOME/.login-daemons" ]; then + . "$HOME/.login-daemons" fi [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function* |