diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 13:39:33 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-21 13:39:33 -0400 |
| commit | 36e34f397b00ad39e21edcd7c91704b1ee454290 (patch) | |
| tree | 91284d3843e133535d17255cca93ab38c0138fa6 /.config/login.sh | |
| parent | 36e3771194274c4dd6358c7d1986ef18ca71677c (diff) | |
| parent | f6742e8302f615b75eb6a2dd4faf3b306be56012 (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs
Conflicts:
.config/login.sh
.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 f1b7838..c43a4a0 100644 --- a/.config/login.sh +++ b/.config/login.sh @@ -44,8 +44,7 @@ fi # 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 # Box-specific stuff ################################################# @@ -75,10 +74,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 @@ -95,6 +94,6 @@ 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 |