diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-22 20:44:04 -0400 |
| commit | ad482d55d2f60cf3c91c9014b934af7ea30b4d88 (patch) | |
| tree | 79bb00ec5be01214f1ebc99509308f2083c17717 /.profile | |
| parent | 2f550711d01c7aa731d75edca9bc4d2a1f718045 (diff) | |
| parent | 510fea7116c6bd01824af38b4e516b6e19fded81 (diff) | |
Merge branch 'master' into build64-par
Conflicts:
.crontab
Diffstat (limited to '.profile')
| -rw-r--r-- | .profile | 19 |
1 files changed, 11 insertions, 8 deletions
@@ -25,13 +25,6 @@ done # Settings ########################################################### -# TMPDIR -if [ -d "$HOME/tmp" ]; then - export TMPDIR="$HOME/tmp" -elif [ -d "$HOME/.prefix/tmp" ]; then - export TMPDIR="$HOME/.prefix/tmp" -fi - # Text editor if [ -f "$HOME/.selected_editor" ]; then . "$HOME/.selected_editor" @@ -49,6 +42,7 @@ _JAVA_OPTIONS='' _JAVA_OPTIONS+=' -Dawt.useSystemAAFontSettings=on' _JAVA_OPTIONS+=' -Dswing.aatext=true' _JAVA_OPTIONS+=' -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel' +_JAVA_OPTIONS+=" -Djava.io.tmpdir=$TMPDIR" export _JAVA_OPTIONS # ALSA @@ -57,7 +51,16 @@ if [ -x "`which alsactl 2>/dev/null`" ]; then fi # X11 -export XAUTHORITY=$HOME/.Xauthority +if [ -z "$XAUTHORITY" ]; then + export XAUTHORITY=$HOME/.Xauthority +fi + +# D-Bus +if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then + eval `dbus-launch` + export DBUS_SESSION_BUS_ADDRESS + export DBUS_SESSION_BUS_PID +fi # Start background programs ########################################## if [ -f "$HOME/.login-daemons" ]; then |