--- trunk/mage/usr/lib/mage/mage4.sh	2005/09/09 18:05:45	233
+++ trunk/mage/usr/lib/mage/mage4.sh	2005/09/10 13:35:31	236
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Magellan Linux Installer (mage.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.4 2005-09-09 18:05:45 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.5 2005-09-10 13:35:31 niro Exp $
 
 # default die function
 die()
@@ -10,15 +10,15 @@
 }
 
 # include all needed files
-[ -f ${MLIBDIR}/conf/mage.rc.global ] &&  \
-	source ${MLIBDIR}/conf/mage.rc.global || \
-	die "${MLIBDIR}/conf/mage.rc.global missing"
+[ -f /etc/mage.rc.global ] &&  \
+	source /etc/mage.rc.global || \
+	die "/etc/mage.rc.global missing"
 
 [ -f /etc/mage.rc ] && source /etc/mage.rc || \
 	die "Your /etc/mage.rc is missing. Aborting."
 
-[ -f ${MLIBDIR}/mage.functions.sh ] && \
-	source ${MLIBDIR}/mage.functions.sh || \
+[ -f ${MLIBDIR}/mage4.functions.sh ] && \
+	source ${MLIBDIR}/mage4.functions.sh || \
 	die "mage functions missing"
 
 # for tests only
@@ -30,7 +30,11 @@
 ## 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"
 COLDEFAULT="\033[0m"
 
 if [[ ${NOCOLORS} = true ]]
@@ -41,6 +45,7 @@
 	COLBLUE=""
 	COLMAGENTA=""
 	COLWHITE=""
+	COLGRAY=""
 	COLDEFAULT=""
 fi
 
@@ -323,8 +328,9 @@
 
 		echo "DEBUG: ${ALLDEPS}"
 		;;
+
 	search)
-		${MLIBDIR}/pkgsearch.sh ${MAGENAME}
+		pkgsearch "${MAGENAME}"
 		;;
 
 	unpack)