From 147080c7bb6da29c3818270ca80072f283532ac3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 20 May 2011 16:41:03 +0200
Subject: [PATCH] base-directories: really fix the /run compat symlinks.

---
 srcpkgs/base-directories/INSTALL  | 29 ++++++++++++++++++++++-------
 srcpkgs/base-directories/template |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/base-directories/INSTALL b/srcpkgs/base-directories/INSTALL
index a07e5f3545..6414503382 100644
--- a/srcpkgs/base-directories/INSTALL
+++ b/srcpkgs/base-directories/INSTALL
@@ -1,13 +1,28 @@
 case "${ACTION}" in
 post)
 	# Create compat symlinks for /run.
-	for d in tmp var/tmp var/run var/lock lib/rc/init.d; do
-		[ -h "$d" ] && rm -f "$d"
+	mntpnts="tmp /run/tmp"
+	mntpnts="$mntpnts var/tmp /run/tmp"
+	mntpnts="$mntpnts var/run /run"
+	mntpnts="$mntpnts var/lock /run/lock"
+	mntpnts="$mntpnts lib/rc/init.d /run/init.d"
+
+	set -- ${mntpnts}
+	while [ $# -gt 0 ]; do
+		dir="$1"
+		dest="$2"
+		if [ -h "$dir" ]; then
+			if [ "$(readlink -f $dir)" != "$dest" ]; then
+				echo "WARNING: removing wrong symlink in /$dir..."
+				rm -f "$dir"
+				ln -sf "$dest" "$dir"
+			fi
+		elif [ -d "$dir" ]; then
+			echo "WARNING: removing directory /$dir..."
+			rm -rf "$dir"
+			ln -sf "$dest" "$dir"
+		fi
+		shift; shift;
 	done
-        ln -sf /run/init.d lib/rc/init.d
-        ln -sf /run/tmp tmp
-        ln -sf /run/tmp var/tmp
-        ln -sf /run var/run
-        ln -sf /run/lock var/lock
 	;;
 esac
diff --git a/srcpkgs/base-directories/template b/srcpkgs/base-directories/template
index 425f74768b..8ba54fe09a 100644
--- a/srcpkgs/base-directories/template
+++ b/srcpkgs/base-directories/template
@@ -1,6 +1,6 @@
 # Template file for 'base-directories'
 pkgname=base-directories
-version=0.7
+version=0.10
 build_style=custom-install
 short_desc="XBPS FHS Base System directories"
 maintainer="Juan RP <xtraeme@gmail.com>"