diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 00:32:22 -0500 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 00:32:22 -0500 |
| commit | 11e461d0fea5aaf33a31ebb88a17135b46c9483d (patch) | |
| tree | fbf08add8e1b03ebb4d73833180b16d4e47d6cd6 /.local | |
| parent | e9ffdb22ece018ea6216e69b9ee5ed32950f61c8 (diff) | |
.local/lib/xdg.sh: handle setting XDG_RUNTIME_DIR better
This is based off of the TMPDIR hack I use on the Purdue CS boxes.
Diffstat (limited to '.local')
| -rw-r--r-- | .local/lib/xdg.sh | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/.local/lib/xdg.sh b/.local/lib/xdg.sh index 2241d2e..20fab4b 100644 --- a/.local/lib/xdg.sh +++ b/.local/lib/xdg.sh @@ -17,7 +17,28 @@ if [[ -n $XDG_RUNTIME_DIR ]] && [[ ! -d $XDG_RUNTIME_DIR ]]; then fi # Set XDG_RUNTIME_DIR if we can -if [[ -z $XDG_RUNTIME_DIR ]] && [[ -n $TMPDIR ]]; then - export XDG_RUNTIME_DIR="$TMPDIR/xdg-runtime" - install -dm0700 "$XDG_RUNTIME_DIR" +if [[ -z $XDG_RUNTIME_DIR ]] && type flock &>/dev/null; then + _diy_xdg_runtime_login() { + export XDG_RUNTIME_DIR="$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME" + readonly XDG_RUNTIME_DIR + # There's a race condition here, between the `ln -s` and `flock`. + # But it's not like I'll be hammering a box with logins. + if [[ ! -d "$XDG_CACHE_HOME" ]]; then + local tmp="$(mktemp --tmpdir -- "${USER}@${HOSTNAME}-runtime.XXXXXXXXXX")" + mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir" + ln -sfT -- "$tmp" "$XDG_RUNTIME_DIR" + fi + if ! [[ /dev/fd/7 -ef "$XDG_CACHE_HOME/xdg-runtime-dir/.lock" ]]; then + exec 7 >"$XDG_CACHE_HOME/xdg-runtime-dir/.lock" + fi + if flock -sn 7; then + trap _diy_xdg_runtime_logout EXIT + fi + } + _diy_xdg_runtime_logout() { + if flock -xn 7; then + rm -rf -- "$(readlink "$XDG_RUNTIME_DIR")" + fi + } + _diy_xdg_runtime_login fi |