From b780c946dc5d61cd00988a62aa281155ffb89363 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lshumake@codeaurora.org>
Date: Thu, 11 Jun 2015 09:05:31 -0600
Subject: fix XDG_RUNTIME_DIR management

---
 .config/login.d/02_xdg_runtime_dir.sh         | 17 +++++++++--------
 .config/login.d/90_dot-runtime.sh             |  4 ++++
 .config/login.d/90_symlink_xdg_runtime_dir.sh |  7 -------
 .config/symlinks                              |  2 --
 4 files changed, 13 insertions(+), 17 deletions(-)
 create mode 100644 .config/login.d/90_dot-runtime.sh
 delete mode 100644 .config/login.d/90_symlink_xdg_runtime_dir.sh

diff --git a/.config/login.d/02_xdg_runtime_dir.sh b/.config/login.d/02_xdg_runtime_dir.sh
index 6700669..864eadd 100644
--- a/.config/login.d/02_xdg_runtime_dir.sh
+++ b/.config/login.d/02_xdg_runtime_dir.sh
@@ -4,22 +4,23 @@
 if [ -z "$XDG_RUNTIME_DIR" ] && shopt -q login_shell && type flock &>/dev/null; then
 	_diy_xdg_runtime_login() {
 		export XDG_RUNTIME_DIR="$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME"
-		# 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_RUNTIME_DIR" ]; then
-			local tmp="$(mktemp -d --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"
-			if flock -sn 7; then
+			if flock -xn 7; then
+				if [ ! -d "$XDG_RUNTIME_DIR" ]; then
+					local tmp="$(mktemp -d --tmpdir -- "${USER}@${HOSTNAME}-runtime.XXXXXXXXXX")"
+					mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir"
+					ln -sfT -- "$tmp" "$XDG_RUNTIME_DIR"
+				fi
 				# Unfortunately this doesn't survive across exec(1).
 				trap _diy_xdg_runtime_logout EXIT
+				flock -sn 7
 			fi
 		fi
 	}
 	_diy_xdg_runtime_logout() {
+		exec 7>&-
+		exec 7>"$XDG_CACHE_HOME/xdg-runtime-dir/.lock"
 		if flock -xn 7; then
 			rm -rf -- "$(readlink "$XDG_RUNTIME_DIR")"
 		fi
diff --git a/.config/login.d/90_dot-runtime.sh b/.config/login.d/90_dot-runtime.sh
new file mode 100644
index 0000000..d06568f
--- /dev/null
+++ b/.config/login.d/90_dot-runtime.sh
@@ -0,0 +1,4 @@
+# This is really only needed for ssh ControlPath; as I don't have a
+# way to communicate XDG_RUNTIME_DIR to it otherwise.
+mkdir -p -- ~/.runtime
+ln -sfT -- "$XDG_RUNTIME_DIR" ~/.runtime/"$HOSTNAME"
diff --git a/.config/login.d/90_symlink_xdg_runtime_dir.sh b/.config/login.d/90_symlink_xdg_runtime_dir.sh
deleted file mode 100644
index 7ee4bba..0000000
--- a/.config/login.d/90_symlink_xdg_runtime_dir.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/hint/sh
-# This is really only needed for ssh ControlPath; as I don't have a
-# way to communicate XDG_RUNTIME_DIR
-if [ -n "$XDG_RUNTIME_DIR" ]; then
-	mkdir -p -- "$XDG_CACHE_HOME/xdg-runtime-dir"
-	ln -sfT -- "$XDG_RUNTIME_DIR" "$XDG_CACHE_HOME/xdg-runtime-dir/$HOSTNAME"
-fi
diff --git a/.config/symlinks b/.config/symlinks
index 80cffc1..9896e0c 100644
--- a/.config/symlinks
+++ b/.config/symlinks
@@ -44,8 +44,6 @@
 
 # .maildirproc is not used, but must exist
 /tmp/			.maildirproc
-# There's a silly maximum length on Domain Sockets, so alias
-.cache/xdg-runtime-dir/	.runtime
 
 # KDE
 .config/		.kde/share/apps #
-- 
cgit v1.2.3-54-g00ecf