diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-15 08:00:11 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-11-15 08:00:11 -0500 |
| commit | ebc4f813d517d44ddf7440fd8043c5d41adf8932 (patch) | |
| tree | 9697e7c5351dc7d4c93a960982de93291d2312cb /.profile | |
| parent | 5257c5fdd016833b86bf2d826ff9e30a1c15bd57 (diff) | |
| parent | 86e56415e8c8081c99b99209182a6b5b34361d74 (diff) | |
Merge branch 'master' into identica-mode-1.2
Diffstat (limited to '.profile')
| -rw-r--r-- | .profile | 31 |
1 files changed, 22 insertions, 9 deletions
@@ -9,16 +9,17 @@ umask 022 # set PATH so it includes user's private bin if it exists -if [ -d "$HOME/.prefix/bin" ]; then - export PATH="$HOME/.prefix/bin:$PATH" -fi - -# if running bash -if [ -n "$BASH_VERSION" ]; then - # include .bashrc if it exists - if [ -f "$HOME/.bashrc" ]; then - . "$HOME/.bashrc" +bins=`echo $HOME/bin $HOME/.prefix/bin $HOME/.gem/ruby/*/bin` +for dir in $bins; do + if [ -d "$dir" ]; then + export PATH="$dir:$PATH" fi +done + +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 @@ -30,6 +31,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 |