--- trunk/mage/usr/lib/mage/mage4.functions.sh	2006/07/17 20:52:38	386
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2007/01/22 00:24:14	419
@@ -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.21 2006-07-17 20:52:38 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.26 2007-01-22 00:24:14 niro Exp $
 
 mage_setup()
 {
@@ -1106,7 +1106,7 @@
 	local count_current
 	local count_total
 
-	[ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your /etc/mage.rc."
+	[ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."
 
 	# get count of total packages
 	declare -i count_current=0
@@ -1181,7 +1181,7 @@
 {
 	if [ -z "${RSYNC}" ]
 	then
-		die "You have no rsync-mirrors defined. Please edit your /etc/mage.rc."
+		die "You have no rsync-mirrors defined. Please edit your ${MAGERC}."
 	fi
 
 	local i
@@ -1240,7 +1240,7 @@
 	if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
 	then
 		#cuts ARCH and PBUILD
-		#ARCH comes from /etc/mage.rc
+		#ARCH comes from ${MAGERC}
 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")
 
 		#cuts version number
@@ -1708,7 +1708,7 @@
 {
 	local i
 
-	if [ -n "$@" ]
+	if [[ -n $@ ]]
 	then
 		for i in $@
 		do
@@ -2428,7 +2428,7 @@
 	echo -ne "${COLBLUE} <<< ${COLDEFAULT}"
 	echo -n "removing: "
 	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
-	echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"
+	echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
 
 	magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
 	source ${magefile}
@@ -2530,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