--- trunk/mage/usr/lib/mage/mage4.functions.sh	2011/12/29 15:12:05	1590
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2012/01/13 13:07:38	1626
@@ -66,7 +66,7 @@
 	case ${method} in
 		md5) cmd="md5sum" ;;
 		sha256) cmd="sha256sum" ;;
-		*) die "mchecksum(): unkown method '${method}'" ;;
+		*) die "mchecksum(): unknown method '${method}'" ;;
 	esac
 
 	if [[ -d ${rundir} ]]
@@ -1401,10 +1401,10 @@
 	real_uris="$(convertmirrors ${uri})"
 
 	# verbose or not
-	mqueryfeature "!verbose" && wget_opts="--quiet"
+	mqueryfeature "!verbose" && wget_opts+=" --quiet"
 
 	# filter wget options if busybox was found
-	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
+	wget_opts+=" $(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
 
 	# create outputdir
 	[[ ! -d ${outputdir} ]] && install -d "${outputdir}"
@@ -3293,6 +3293,7 @@
 		purge|!purge) retval=0 ;;
 		qalint|!qalint) retval=0 ;;
 		regentree|!regentree) retval=0 ;;
+		resume|!resume) retval=0 ;;
 		stepbystep|!stepbystep) retval=0 ;;
 		srcpkgbuild|!srcpkgbuild) retval=0 ;;
 		srcpkgtarball|!srcpkgtarball) retval=0 ;;
@@ -3305,13 +3306,10 @@
 
 load_mage_features()
 {
-	echo -en "${COLBLUE}---${COLGREEN} Loading mage-features... ${COLDEFAULT}"
 	for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}
 	do
 		FVERBOSE=off msetfeature ${i}
 	done
-
-	echo -e "${COLGREEN}done${COLDEFAULT}"
 }
 
 msetfeature()
@@ -3328,7 +3326,7 @@
 
 		if ! known_mage_feature "${feature}"
 		then
-			[[ ${FVERBOSE} = off ]] || echo "unkown feature ${feature}, ignoring it"
+			[[ ${FVERBOSE} = off ]] || echo "unknown feature ${feature}, ignoring it"
 			return 3
 		fi
 
@@ -3336,17 +3334,17 @@
 		do
 			if [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature} ]]
 			then
-				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' already enabled"
+				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' already enabled${COLDEFAULT}"
 				MAGE_FEATURES_CURRENT[${i}]="${feature}"
 				found=1
 			elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = !${feature} ]]
 			then
-				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' currently disabled, enabling it!"
+				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' currently disabled, enabling it!${COLDEFAULT}"
 				MAGE_FEATURES_CURRENT[${i}]="${feature}"
 				found=1
 			elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature//!} ]]
 			then
-				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature//!}' currently enabled, disabling it!"
+				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature//!}' currently enabled, disabling it!${COLDEFAULT}"
 				MAGE_FEATURES_CURRENT[${i}]="${feature}"
 				found=1
 			fi
@@ -3356,7 +3354,7 @@
 		# it was not declared. in this case enable it
 		if [[ ${found} = 0 ]]
 		then
-			[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' was not declared, enabling it!"
+			[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' was not declared, enabling it!${COLDEFAULT}"
 			MAGE_FEATURES_CURRENT=( ${MAGE_FEATURES_CURRENT[*]} "${feature}" )
 		fi