--- trunk/mage/usr/lib/mage/mage4.functions.sh	2012/01/13 21:04:02	1649
+++ 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} ..."
@@ -1579,14 +1603,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
@@ -1645,20 +1678,23 @@
 }
 
 
-# cuts full pathnames or versionized names down to basename
-choppkgname()
-{
-	#we want this only if full name was used
-	if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
-	then
-		#cuts ARCH and PBUILD
-		#ARCH comes from ${MAGERC}
-		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
+# unused?
+#
+# # cuts full pathnames or versionized names down to basename
+# choppkgname()
+# {
+# 	#we want this only if full name was used
+# 	if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
+# 	then
+# 		#cuts ARCH and PBUILD
+# 		#ARCH comes from ${MAGERC}
+# 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
+# 
+# 		#cuts version number
+# 		MAGENAME=$(basename ${MAGENAME%-*} .mage)
+# 	fi
+# }
 
-		#cuts version number
-		MAGENAME=$(basename ${MAGENAME%-*} .mage)
-	fi
-}
 
 # get_categorie $PNAME, returns CATEGORIE
 # $1=pname
@@ -2759,7 +2795,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} :("