--- trunk/mage/usr/lib/mage/mage4.functions.sh	2005/09/11 19:47:08	240
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2005/10/02 14:09:41	252
@@ -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.3 2005-09-11 19:47:08 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.6 2005-10-02 14:09:41 niro Exp $
 
 mage_setup()
 {
@@ -1667,7 +1667,7 @@
 	local newest_mage
 	local installed_mage
 
-	newest_mage="$( CATEGORIE=app-mage MAGENAME=mage get_highest_magefile;echo $(basename ${MAGEFILE} .mage) )"
+	newest_mage="$(basename $(get_highest_magefile app-mage mage) .mage)"
 	installed_mage="$(magequery -n mage | cut -d' ' -f5)"
 
 	if [[ ${newest_mage} > ${installed_mage} ]]
@@ -1960,6 +1960,8 @@
 	local PKGTYPE
 	local preinstall
 	local postinstall
+	local preremove
+	local postremove
 
 	# sanity checks
 	[ -f ${magefile} ] && source ${magefile} || \
@@ -1969,6 +1971,11 @@
 	source ${magefile}
 	eval value=\$$(echo ${var})
 	echo "${value}"
+
+	unset preinstall
+	unset postinstall
+	unset preremove
+	unset postremove
 }
 
 mage_install()
@@ -1985,6 +1992,8 @@
 	local PKGTYPE
 	local preinstall
 	local postinstall
+	local preremove
+	local postremove
 
 	local pcat
 	local pname
@@ -2146,6 +2155,11 @@
 # 	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
 # 	echo -ne "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT} "
 	echo "successfully installed."
+
+	unset preinstall
+	unset postinstall
+	unset preremove
+	unset postremove
 }
 
 md5sum_packages()
@@ -2304,6 +2318,8 @@
 	local PKGTYPE
 	local preinstall
 	local postinstall
+	local preremove
+	local postremove
 
 	local pcat
 	local pname
@@ -2401,6 +2417,11 @@
 # 	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
 # 	echo -ne "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT} "
 	echo "successfully removed."
+
+	unset preinstall
+	unset postinstall
+	unset preremove
+	unset postremove
 }
 
 show_etc_update_mesg() {
@@ -2499,3 +2520,25 @@
 		unset ipbuild
 	done
 }
+
+export_inherits()
+{
+	local include="$1"
+	shift
+
+	while [ "$1" ]
+	do
+		local functions="$1"
+
+		# sanity checks
+		[ -z "${include}" ] && die "export_inherits(): \$include not given."
+		[ -z "${functions}" ] && die "export_inherits(): \$functions not given."
+
+		eval "${functions}() { ${include}_${functions} ; }"
+
+		# debug
+		[[ ${MAGEDEBUG} = on ]] && typeset -f "${functions}"
+
+		shift
+	done
+}