--- trunk/mage/usr/lib/mage/mage4.sh	2011/12/20 12:58:32	1541
+++ trunk/mage/usr/lib/mage/mage4.sh	2013/08/14 07:25:43	2156
@@ -22,30 +22,6 @@
 	source ${MLIBDIR}/mage4.functions.sh || \
 	die "mage functions missing"
 
-## only for tests -> normally in /etc/rc.d/init.d/functions
-COLRED="\033[1;6m\033[31m"
-COLGREEN="\033[1;6m\033[32m"
-COLYELLOW="\033[1;6m\033[33m"
-COLBLUE="\033[1;6m\033[34m"
-COLMAGENTA="\033[1;6m\033[35m"
-COLWHITE="\033[1;6m\033[37m"
-COLGRAY="\033[0;6m\033[37m"
-COLBOLD="\033[1m"
-COLDEFAULT="\033[0m"
-
-if [[ ${NOCOLORS} = true ]]
-then
-	COLRED=""
-	COLGREEN=""
-	COLYELLOW=""
-	COLBLUE=""
-	COLMAGENTA=""
-	COLWHITE=""
-	COLGRAY=""
-	COLBOLD=""
-	COLDEFAULT=""
-fi
-
 # export default path
 export PATH="${PATH}:${MLIBDIR}"
 
@@ -93,6 +69,7 @@
 	echo "    clean           - removes *all* downloaded packages"
 	echo "    unpack          - unpacks *all* needed package for 'foo'"
 	echo "    download        - downloads *all* needed packages for 'foo'"
+	echo "    print-features  - prints all enabled mage-features"
 	echo "    version         - prints version info"
 	echo "    regen-mage-tree - regenerates the whole mage database (for devs only)"
 	echo
@@ -118,19 +95,20 @@
 # install method
 METHOD="$1"
 
-# initial unversionized packagename, gets overridden later
+# initial unversionized packagename, gets overridden later on
 MAGENAME="$2"
 
-if [[ ${METHOD} != upgrade ]] && \
-	[[ ${METHOD} != srcupgrade ]] && \
-	[[ ${METHOD} != uppretend ]] && \
-	[[ ${METHOD} != srcuppretend ]] && \
-	[[ ${METHOD} != update ]] && \
-	[[ ${METHOD} != update-tarball ]] && \
-	[[ ${METHOD} != clean ]] && \
-	[[ ${METHOD} != version ]] && \
-	[[ ${METHOD} != search ]] && \
-	[[ ${METHOD} != regen-mage-tree ]]
+if [[ ${METHOD} != upgrade ]] &&
+	[[ ${METHOD} != srcupgrade ]] &&
+	[[ ${METHOD} != uppretend ]] &&
+	[[ ${METHOD} != srcuppretend ]] &&
+	[[ ${METHOD} != update ]] &&
+	[[ ${METHOD} != update-tarball ]] &&
+	[[ ${METHOD} != clean ]] &&
+	[[ ${METHOD} != version ]] &&
+	[[ ${METHOD} != search ]] &&
+	[[ ${METHOD} != regen-mage-tree ]] &&
+	[[ ${METHOD} != print-features ]]
 then
 	[[ -z ${METHOD} ]] || [[ -z ${MAGENAME} ]] && print_usage && exit 1
 fi
@@ -145,6 +123,9 @@
 # before anything run mage_setup
 mage_setup || die "error in mage_setup()"
 
+# load supported mage features
+load_mage_features
+
 case ${METHOD} in
 	download)
 		# first of all get the right pkg which going to be installed
@@ -281,7 +262,6 @@
 		# first fetch all packages
 		fetch_packages ${ALLDEPS} || die "fetching packages"
 		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
-		unpack_packages ${ALLDEPS} || die "unpacking packages"
 		install_packages ${ALLDEPS} || die "installing packages"
 		;;
 
@@ -360,7 +340,6 @@
 		# first fetch all packages
 		fetch_packages ${ALLDEPS} || die "fetching packages"
 		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
-		unpack_packages ${ALLDEPS} || die "unpacking packages"
 		install_packages ${ALLDEPS} || die "installing packages"
 		;;
 
@@ -450,6 +429,10 @@
 		done
 		;;
 
+	print-features)
+		mprintfeatures
+		;;
+
 	*)
 		print_usage
 		;;