diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-21 22:39:19 -0400 |
| commit | bc4a3914db8b294238df438750863214bdb83f4d (patch) | |
| tree | 18d1023524b22ea2eee292a8ba603cece46d9768 /.profile | |
| parent | ae33398b4eefc8fd729c201c984126960d579afc (diff) | |
| parent | 69e7a06e976bbad54684b8c650853020c8352adb (diff) | |
Merge branch 'master' into hp-dv6426us-par
Conflicts:
.emacs.d/custom.el
Diffstat (limited to '.profile')
| -rw-r--r-- | .profile | 11 |
1 files changed, 3 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" @@ -58,7 +51,9 @@ 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 |