--- trunk/mage/usr/lib/mage/mage4.functions.sh	2012/01/13 21:05:41	1650
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2012/01/13 23:20:39	1654
@@ -82,6 +82,25 @@
 	return "${retval}"
 }
 
+mcheckemptydir()
+{
+	local dir="$1"
+	local retval=1
+
+	if [[ ! -d ${dir} ]]
+	then
+		echo "mcheckemptydir(): '${dir}' is not a directory!"
+		retval=3
+	else
+		shopt -s nullglob dotglob
+		files=( ${dir}/* )
+		(( ${#files[*]} )) || retval=0
+		shopt -u nullglob dotglob
+	fi
+
+	return ${retval}
+}
+
 unpack_packages()
 {
 	local list="$@"
@@ -1579,14 +1598,23 @@
 		else
 			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
 			echo -n "checking md5sum... "
-			( cd ${temp}; md5sum -c ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
+			mchecksum --rundir "${temp}" --file "${latest_md5}" --method md5 || die "md5 for ${latest_tarball} failed"
 		fi
 
 		if [[ -d ${MAGEDIR} ]]
 		then
 			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
 			echo "cleaning old mage-tree ${MAGEDIR}..."
-			rm -rf ${MAGEDIR}
+			# honor mountpoints and empty dirs
+			if mountpoint -q ${MAGEDIR}
+			then
+				if ! mcheckemptydir ${MAGEDIR}
+				then
+					find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xarg --no-run-if-empty rm -r
+				fi
+			else
+				rm -rf ${MAGEDIR}
+			fi
 		fi
 
 		if need_busybox_support tar
@@ -2762,7 +2790,7 @@
 		then
 			echo -ne "${COLBLUE} *** ${COLDEFAULT}"
 			echo -ne "checking md5sum (${count_current}/${count_total}): "
-			( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed"
+			mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 || die "md5 for ${pkgfile} failed"
 		else
 			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
 			echo -e "!! no md5sum file found for ${pkgfile} :("