--- trunk/mage/usr/lib/mage/mage4.functions.sh	2012/01/13 23:20:39	1654
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2012/02/18 13:48:34	1758
@@ -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
@@ -170,8 +171,9 @@
 	mtime=$(stat -c %Y "${reference}")
 	touch \
 		--no-create \
+		--no-dereference \
 		--time=mtime \
-		--reference "${reference}" \
+		--reference="${reference}" \
 		"${pathto}"
 
 	echo "${mtime}"
@@ -413,13 +415,13 @@
 
 		ln -snf "${link}" "${MROOT}${pathto}"
 
-# 		# fix mtime and db
-# 		fix_descriptor ${pkgname}/.symlinks \
-# 			"${pathto}" \
-# 			"${posix}" \
-# 			"${link}" \
-# 			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
-# 				"${MROOT}${pathto}")"
+ 		# fix mtime and db
+ 		fix_descriptor ${pkgname}/.symlinks \
+ 			"${pathto}" \
+ 			"${posix}" \
+ 			"${link}" \
+ 			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
+ 				"${MROOT}${pathto}")"
 
 	done < ${BUILDDIR}/${pkgname}/.symlinks
 
@@ -806,20 +808,9 @@
 
 	mtime="$(stat -c %Y ${MROOT}${INSTALLDB}/${pfull}/.mtime)"
 
-	# if $pathto is a symlink than compare linked binary
-	if [ -L "${MROOT}${pathto}" ]
-	then
-		# readlink -f resolves full path of linked file
-		x="$(readlink -f "${MROOT}${pathto}")"
-
-		# abort if target does not exists
-		# we keep safe here, theoretically the link can removed
-		[ ! -e "${x}" ] && return 1
-
-		x=$(stat -c %Y "${x}")
-	else
-		x=$(stat -c %Y "${MROOT}${pathto}")
-	fi
+	# no extra handlink for symlinks anymore as fix_mtime
+	# uses --no-dereference, compare directly
+	x=$(stat -c %Y "${MROOT}${pathto}")
 
 	[[ ${mtime} = ${x} ]] && return 0
 
@@ -1564,8 +1555,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} ..."
@@ -1875,18 +1870,35 @@
 	local filename="${file##*/}"
 	local count
 	local output
+	local oldprotected
 	local i
+	local x
+
+	# hack; do not honor a global set IFS like '§'
+	local IFS
 
-	declare -i count=0
+	count=0
 
 	# check if there are already protected files
-	for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |
+	for oldprotected in $(find ${dirname} -iname "._cfg????_${filename}" |
 		sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |
 		sort -t'%' -k3 -k2 | cut -f1 -d'%')
 	do
-		count=$(echo ${oldpretected} | cut -d_ -f2 | sed -e "s:cfg::")
+		count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"
+	done
+
+	# dirty hack to convert 0001 -> 1; 0120 -> 120 etc
+	x="${#count}"
+	for (( i=0; i<x; i++ ))
+	do
+		if [[ ${count:${i}:1} != 0 ]]
+		then
+			count="${count:${i}}"
+			break
+		fi
 	done
-	(( count ++ ))
+
+	count="${count}+1"
 
 	# fill output up with zeros
 	for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done