--- trunk/mage/usr/lib/mage/mage4.sh	2005/12/26 23:13:42	305
+++ trunk/mage/usr/lib/mage/mage4.sh	2011/04/26 08:57:30	1269
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 # Magellan Linux Installer (mage.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.12 2005-12-26 23:13:42 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.17 2008-06-16 09:29:57 niro Exp $
 
 # default die function
 die()
 {
+	echo -e ${COLRED}"Exited ${BASH_SOURCE} at line no ${BASH_LINENO}."${COLDEFAULT}
 	echo -e ${COLRED}"$@"${COLDEFAULT}
 	exit 1
 }
@@ -14,8 +15,8 @@
 	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 ${MAGERC} ] && source ${MAGERC} || \
+	die "Your ${MAGERC} is missing. Aborting."
 
 [ -f ${MLIBDIR}/mage4.functions.sh ] && \
 	source ${MLIBDIR}/mage4.functions.sh || \
@@ -54,7 +55,7 @@
 # sanity checks
 [ ! -e ${VIRTUALDB_FILE} ] && touch ${VIRTUALDB_FILE}
 
-if [ ! -e ${VIRTUALDB_DEFAULTS} ] && [[ $1 != update ]]
+if [ ! -e ${VIRTUALDB_DEFAULTS} ] && [[ $1 != update ]] && [[ $1 != update-tarball ]]
 then
 	echo
 	echo "Please choose an profile from the mage tree."
@@ -82,7 +83,8 @@
 	echo "    install         - installs a package"
 	echo "    srcinstall      - installs a package from source"
 	echo "    uninstall       - removes a package"
-	echo "    update          - updates mage-tree"
+	echo "    update          - updates the mage-tree via rsync"
+	echo "    update-tarball  - updates the mage-tree via a tarball"
 	echo "    uppretend       - pretend dependencies for a system upgrade"
 	echo "    upgrade         - runs a complete system upgrade"
 	echo "    srcuppretend    - pretend dependencies for a system upgrade from source"
@@ -124,6 +126,7 @@
 	[[ ${METHOD} != uppretend ]] && \
 	[[ ${METHOD} != srcuppretend ]] && \
 	[[ ${METHOD} != update ]] && \
+	[[ ${METHOD} != update-tarball ]] && \
 	[[ ${METHOD} != clean ]] && \
 	[[ ${METHOD} != version ]] && \
 	[[ ${METHOD} != search ]] && \
@@ -153,6 +156,9 @@
 		# source the highest magefile of this pkg
 		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
+		# package is masked
+		[ -z "${PKGNAME}" ] && die "Package '${MAGENAME}' is masked and not available for installation."
+
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
 		PNAME="$(pkgname2pname ${PKGNAME})"
@@ -180,6 +186,9 @@
 		# source the highest magefile of this pkg
 		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
+		# package is masked
+		[ -z "${PKGNAME}" ] && die "Package '${MAGENAME}' is masked and not available for installation."
+
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
 		PNAME="$(pkgname2pname ${PKGNAME})"
@@ -206,6 +215,9 @@
 		# source the highest magefile of this pkg
 		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
+		# package is masked
+		[ -z "${PKGNAME}" ] && die "Package '${MAGENAME}' is masked and not available for installation."
+
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
 		PNAME="$(pkgname2pname ${PKGNAME})"
@@ -239,6 +251,9 @@
 		# source the highest magefile of this pkg
 		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
+		# package is masked
+		[ -z "${PKGNAME}" ] && die "Package '${MAGENAME}' is masked and not available for installation."
+
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
 		PNAME="$(pkgname2pname ${PKGNAME})"
@@ -278,6 +293,9 @@
 		# source the highest magefile of this pkg
 		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
+		# package is masked
+		[ -z "${PKGNAME}" ] && die "Package '${MAGENAME}' is masked and not available for installation."
+
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
 		PNAME="$(pkgname2pname ${PKGNAME})"
@@ -365,6 +383,9 @@
 		# source the highest magefile of this pkg
 		PKGNAME=$(get_value_from_magefile PKGNAME $(get_highest_magefile ${PCAT} ${MAGENAME}))
 
+		# package is masked
+		[ -z "${PKGNAME}" ] && die "Package '${MAGENAME}' is masked and not available for installation."
+
 		# convert PKGNAME to PNAME/PVER/PBUILD
 		# we're working *only* with these three vars from here on
 		PNAME="$(pkgname2pname ${PKGNAME})"
@@ -387,6 +408,10 @@
 		syncmage
 		;;
 
+	update-tarball)
+		syncmage_tarball
+		;;
+
 	clean)
 		cleanpkg
 		;;