--- trunk/mage/usr/lib/mage/mage4.functions.sh	2012/01/13 23:16:36	1652
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2012/02/06 09:45:23	1675
@@ -72,7 +72,8 @@
 	if [[ -d ${rundir} ]]
 	then
 		pushd ${rundir} &> /dev/null
-		${cmd} -c ${file} &> /dev/null
+		# be verbose here
+		${cmd} -c ${file} #&> /dev/null
 		retval="$?"
 		popd &> /dev/null
 	else
@@ -82,6 +83,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="$@"
@@ -1545,8 +1565,12 @@
 
 	for mirr in ${MIRRORS}
 	do
-		# path without distribution
-		mymirr="${mirr%/*}"
+		# path without distribution 
+		# (only for stable|testing|unstable and not DISTROTAG)
+		case ${mirr##*/} in
+			stable|testing|unstable) mymirr="${mirr%/*}";;
+			*) mymirr="${mirr}";;
+		esac
 
 		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
 		echo "fetching latest md5 from ${mymirr} ..."
@@ -1586,7 +1610,16 @@
 		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