--- trunk/mage/usr/lib/mage/mage4.functions.sh	2012/10/26 21:14:51	1963
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2013/08/14 07:25:43	2156
@@ -102,12 +102,50 @@
 	return ${retval}
 }
 
+unpack_package()
+{
+	local magefile="$1"
+	local pkg
+	local pkgtype
+	local tar_opts
+
+	pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"
+	pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
+
+	xtitle "[ Unpacking ${pkg} ]"
+
+	# abort on virtual pkg
+	if [[ ${pkgtype} = virtual ]]
+	then
+		echo -ne " ${COLBLUE}---${COLDEFAULT}"
+		echo " !unpack virtual ${pkg/.${PKGSUFFIX}/} ... "
+		continue
+	fi
+
+	# abort on sources pkg
+	if [[ ${pkgtype} = sources ]]
+	then
+		echo -ne " ${COLBLUE}---${COLDEFAULT}"
+		echo " !unpack sources ${pkg/.${PKGSUFFIX}/} ... "
+		continue
+	fi
+
+	# busybox?
+	if need_busybox_support tar
+	then
+		tar_opts="xjf"
+	else
+		tar_opts="xjmf"
+	fi
+
+	echo -e " ${COLBLUE}***${COLDEFAULT} unpacking ${pkg} ... "
+	tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"
+}
+
 unpack_packages()
 {
 	local list="$@"
 	local magefile
-	local pkg
-	local pkgtype
 	local count_current
 	local count_total
 	local tar_opts
@@ -120,38 +158,8 @@
 
 	for magefile in ${list}
 	do
-		pkg="$(get_value_from_magefile PKGNAME ${magefile}).${PKGSUFFIX}"
-		pkgtype="$(get_value_from_magefile PKGTYPE ${magefile})"
-
+		unpack_package "${magefile}"
 		(( count_current++ ))
-		xtitle "[ (${count_current}/${count_total}) Unpacking ${pkg} ]"
-
-		# abort on virtual pkg
-		if [[ ${pkgtype} = virtual ]]
-		then
-			echo -ne " ${COLBLUE}---${COLDEFAULT}"
-			echo " !unpack virtual (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "
-			continue
-		fi
-
-		# abort on sources pkg
-		if [[ ${pkgtype} = sources ]]
-		then
-			echo -ne " ${COLBLUE}---${COLDEFAULT}"
-			echo " !unpack sources (${count_current}/${count_total}): ${pkg/.${PKGSUFFIX}/} ... "
-			continue
-		fi
-
-		# busybox?
-		if need_busybox_support tar
-		then
-			tar_opts="xjf"
-		else
-			tar_opts="xjmf"
-		fi
-
-		echo -e " ${COLBLUE}***${COLDEFAULT} unpacking (${count_current}/${count_total}): ${pkg} ... "
-		tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"
 	done
 
 	# add a crlf for a better view
@@ -2689,6 +2697,7 @@
 	if [[ ${PKGTYPE} != virtual ]] && \
 		[[ ${PKGTYPE} != sources ]]
 	then
+		unpack_package "${magefile}"
 		echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
 		build_doinstall ${PKGNAME}
 	fi