--- trunk/mage/usr/lib/mage/mage4.sh	2005/12/26 23:13:42	305
+++ trunk/mage/usr/lib/mage/mage4.sh	2011/12/20 12:58:32	1541
@@ -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})"
@@ -230,6 +242,8 @@
 		;;
 
 	install)
+		have_root_privileges || die "You must be root to run this operation."
+ 
 		# first of all get the right pkg which going to be installed
 		PCAT="$(pname2pcat ${MAGENAME})"
 
@@ -239,6 +253,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})"
@@ -269,6 +286,8 @@
 		;;
 
 	srcinstall)
+		have_root_privileges || die "You must be root to run this operation."
+
 		# first of all get the right pkg which going to be installed
 		PCAT="$(pname2pcat ${MAGENAME})"
 
@@ -278,6 +297,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})"
@@ -304,12 +326,14 @@
 		;;
 
 	uninstall)
-			ALLDEPS="$(get_uninstall_candidates --pname ${MAGENAME})"
-			if [ -z "${ALLDEPS}" ]
-			then
-				die "No package installed named '${MAGENAME}'."
-			fi
-			uninstall_packages ${ALLDEPS}
+		have_root_privileges || die "You must be root to run this operation."
+
+		ALLDEPS="$(get_uninstall_candidates --pname ${MAGENAME})"
+		if [ -z "${ALLDEPS}" ]
+		then
+			die "No package installed named '${MAGENAME}'."
+		fi
+		uninstall_packages ${ALLDEPS}
 		;;
 
 	uppretend|srcuppretend)
@@ -322,6 +346,8 @@
 		;;
 
 	upgrade)
+		have_root_privileges || die "You must be root to run this operation."
+
 		# get all dependencies of *all* installed packages
 		# fake pcat,pname,pver,pbuild ...
 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
@@ -339,6 +365,8 @@
 		;;
 
 	srcupgrade)
+		have_root_privileges || die "You must be root to run this operation."
+
 		# get all dependencies of *all* installed packages
 		# fake pcat,pname,pver,pbuild ...
 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
@@ -356,6 +384,8 @@
 		;;
 
 	unpack)
+		have_root_privileges || die "You must be root to run this operation."
+
 		# first of all get the right pkg which going to be installed
 		PCAT="$(pname2pcat ${MAGENAME})"
 
@@ -365,6 +395,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})"
@@ -384,10 +417,17 @@
 		;;
 
 	update)
+		have_root_privileges || die "You must be root to run this operation."
 		syncmage
 		;;
 
+	update-tarball)
+		have_root_privileges || die "You must be root to run this operation."
+		syncmage_tarball
+		;;
+
 	clean)
+		have_root_privileges || die "You must be root to run this operation."
 		cleanpkg
 		;;
 
@@ -397,6 +437,8 @@
 		;;
 
 	regen-mage-tree)
+		have_root_privileges || die "You must be root to run this operation."
+
 		if [ -z "${SMAGESCRIPTSDIR}" ] || [ ! -d "${SMAGESCRIPTSDIR}" ]
 		then
 			echo "SMAGESCRIPTSDIR not found. Check your mage.rc or check out smage repos."