--- trunk/mage/usr/lib/mage/mage4.sh	2005/09/09 17:49:43	230
+++ 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.2 2005-09-09 17:49:43 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,27 +10,31 @@
 }
 
 # 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 ] && source /etc/mage.rc || \
-# 	die "Your /etc/mage.rc is missing. Aborting."
-# 
-# [ -f ${MLIBDIR}/mage.functions.sh ] && \
-# 	source ${MLIBDIR}/mage.functions.sh || \
-# 	die "mage functions 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}/mage4.functions.sh ] && \
+	source ${MLIBDIR}/mage4.functions.sh || \
+	die "mage functions missing"
 
 # for tests only
-source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage.rc.global
-source /etc/mage.rc
-source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh
-MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage
+#source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage.rc.global
+#source /etc/mage.rc
+#source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh
+#MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage
 
 ## 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
 
@@ -121,7 +126,12 @@
 if [[ ${METHOD} != upgrade ]] && \
 	[[ ${METHOD} != srcupgrade ]] && \
 	[[ ${METHOD} != uppretend ]] && \
-	[[ ${METHOD} != srcuppretend ]]
+	[[ ${METHOD} != srcuppretend ]] && \
+	[[ ${METHOD} != update ]] && \
+	[[ ${METHOD} != clean ]] && \
+	[[ ${METHOD} != version ]] && \
+	[[ ${METHOD} != search ]] && \
+	[[ ${METHOD} != regen-mage-tree ]]
 then
 	[[ -z ${METHOD} ]] || [[ -z ${MAGENAME} ]] && print_usage && exit 1
 fi
@@ -318,8 +328,9 @@
 
 		echo "DEBUG: ${ALLDEPS}"
 		;;
+
 	search)
-		${MLIBDIR}/pkgsearch.sh ${MAGENAME}
+		pkgsearch "${MAGENAME}"
 		;;
 
 	unpack)