From 11e461d0fea5aaf33a31ebb88a17135b46c9483d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Thu, 29 Jan 2015 00:32:22 -0500
Subject: .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.
---
 .local/lib/xdg.sh | 27 ++++++++++++++++++++++++---
 1 file 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
-- 
cgit v1.1-4-g5e80