--- trunk/mage/usr/lib/mage/mage4.functions.sh	2006/04/27 11:52:59	370
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2007/01/21 23:22:15	415
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Magellan Linux Installer Functions (mage.functions.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.18 2006-04-27 11:52:53 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.24 2007-01-21 23:22:15 niro Exp $
 
 mage_setup()
 {
@@ -1187,20 +1187,7 @@
 	local i
 	for i in ${RSYNC}
 	do
-		rsync \
-			--recursive \
-			--links \
-			--perms \
-			--times \
-			--devices \
-			--timeout=600 \
-			--verbose \
-			--compress \
-			--progress \
-			--stats \
-			--delete \
-			--delete-after \
-			${i} ${MAGEDIR}
+		rsync ${RSYNC_FETCH_OPTIONS} ${i} ${MAGEDIR}
 		if [[ $? = 0 ]]
 		then
 			break
@@ -1721,7 +1708,7 @@
 {
 	local i
 
-	if [ -n "$@" ]
+	if [[ -n $@ ]]
 	then
 		for i in $@
 		do
@@ -1763,7 +1750,7 @@
 		echo -en ${COLRED}"An update for your packetmanager is available. "${COLDEFAULT}
 		echo -e ${COLBLUE}"[ ${newest_mage} ]"${COLDEFAULT}
 		echo "It is recommened to install this newer version"
-		echo "or your current system installation may brake."
+		echo "or your current system installation may break."
 		echo
 		echo -en "Please update mage by running "
 		echo -e ${COLGREEN}"'mage install mage'"${COLDEFAULT}
@@ -2170,6 +2157,7 @@
 		smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
 		if [ -f "${smage2file}" ]
 		then
+			echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
 			smage2 ${smage2file} || die "compile failed"
 		else
 			echo
@@ -2183,14 +2171,7 @@
 	if [[ ${PKGTYPE} != virtual ]] && \
 		[[ ${PKGTYPE} != sources ]]
 	then
-		# show a verbose message on src-install
-		if [[ ${src_install} = true ]]
-		then
-			echo -ne "${COLBLUE} *** ${COLDEFAULT}"
-			echo -ne "merging files: "
-			echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
-			echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"
-		fi
+		echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
 		build_doinstall ${PKGNAME}
 	fi
 
@@ -2447,7 +2428,7 @@
 	echo -ne "${COLBLUE} <<< ${COLDEFAULT}"
 	echo -n "removing: "
 	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
-	echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"
+	echo -e "${COLGRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
 
 	magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
 	source ${magefile}
@@ -2549,7 +2530,7 @@
 	local ipbuild
 
 	# only names no versions
-	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*')"
+	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*'| sed '/profiles/d' | sed '/includes/d')"
 	#result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"
 
 	# nothing found