diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-26 13:56:43 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-26 13:56:43 -0400 |
| commit | a0b0e2faf634625c2ae1981cb1a5604648ad8334 (patch) | |
| tree | f288acabdb8849a46e333536a71004d39ac2ba34 /.config/login.sh | |
| parent | e93048c125c728d61613d76eab938da9bf7f41c4 (diff) | |
| parent | f6742e8302f615b75eb6a2dd4faf3b306be56012 (diff) | |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.config/wmii-hg/autostart
Diffstat (limited to '.config/login.sh')
| -rw-r--r-- | .config/login.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.config/login.sh b/.config/login.sh index 3c29c99..e1650b2 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -28,8 +28,7 @@ export TMPDIR="$HOME/tmp" # XDG ################################################################ . "$HOME/.local/lib/xdg.sh" -mkdir -p -- "$XDG_RUNTIME_DIR/sessions" -ln -sfT -- "$XDG_RUNTIME_DIR/sessions" ~/.sessions +ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime # Settings ########################################################### @@ -52,10 +51,10 @@ if [[ -z $GPGKEY ]] && [[ -f "${HOME}/.gnupg/gpg.conf" ]]; then echo 'login: Setting GPGKEY' export GPGKEY=`sed -nr 's/^\s*default-key\s+//p' "${HOME}/.gnupg/gpg.conf"` fi -if [[ -f ~/.sessions/gpg ]]; then +if [[ -f ~/.runtime/gpg ]]; then echo 'login: Setting gpg-agent info:' - cat ~/.sessions/gpg - . ~/.sessions/gpg + cat ~/.runtime/gpg + . ~/.runtime/gpg export GPG_AGENT_INFO #export SSH_AUTH_SOCK fi @@ -72,8 +71,8 @@ export _JAVA_OPTIONS # X11 if [[ -z $XAUTHORITY ]]; then - #export XAUTHORITY="$HOME/.Xauthority" - export XAUTHORITY=$HOME/.sessions/Xauthority + export XAUTHORITY="$HOME/.Xauthority" + #export XAUTHORITY=$HOME/.runtime/Xauthority fi # D-Bus |