--- trunk/mage/usr/lib/mage/mage4.sh	2005/09/27 14:36:57	247
+++ trunk/mage/usr/lib/mage/mage4.sh	2005/10/03 13:48:06	254
@@ -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.7 2005-09-27 14:36:57 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.8 2005-10-03 13:48:06 niro Exp $
 
 # default die function
 die()
@@ -148,7 +148,7 @@
 		[ -z "${PCAT}" ] && die "Package '${MAGENAME}' does not exist."
 
 		# source the highest magefile of this pkg
-		source $(get_highest_magefile ${PCAT} ${MAGENAME})
+		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
@@ -175,7 +175,7 @@
 		[ -z "${PCAT}" ] && die "Package '${MAGENAME}' does not exist."
 
 		# source the highest magefile of this pkg
-		source $(get_highest_magefile ${PCAT} ${MAGENAME})
+		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
@@ -201,7 +201,7 @@
 		[ -z "${PCAT}" ] && die "Package '${MAGENAME}' does not exist."
 
 		# source the highest magefile of this pkg
-		source $(get_highest_magefile ${PCAT} ${MAGENAME})
+		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
@@ -234,7 +234,7 @@
 		[ -z "${PCAT}" ] && die "Package '${MAGENAME}' does not exist."
 
 		# source the highest magefile of this pkg
-		source $(get_highest_magefile ${PCAT} ${MAGENAME})
+		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
@@ -273,7 +273,7 @@
 		[ -z "${PCAT}" ] && die "Package '${MAGENAME}' does not exist."
 
 		# source the highest magefile of this pkg
-		source $(get_highest_magefile ${PCAT} ${MAGENAME})
+		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
@@ -360,7 +360,7 @@
 		[ -z "${PCAT}" ] && die "Package '${MAGENAME}' does not exist."
 
 		# source the highest magefile of this pkg
-		source $(get_highest_magefile ${PCAT} ${MAGENAME})
+		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on