/[magellan-source]/trunk/mage/usr/lib/mage/mage4.sh

Diff of /trunk/mage/usr/lib/mage/mage4.sh

Parent Directory | Revision Log | View Patch Patch

-revision 299 by niro,
Sun Dec  4 17:12:07 2005 UTC
+revision 1269 by niro,
Tue Apr 26 08:57:30 2011 UTC
 Line 1
- #!/bin/sh
+ #!/bin/bash
  # Magellan Linux Installer (mage.sh)
- # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.11 2005-12-04 17:12:07 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
  }
-Line 14 
 die()
+Line 15 
 die()
  	source /etc/mage.rc.global || \
  	die "/etc/mage.rc.global missing"
- [ -f /etc/mage.rc ] && source /etc/mage.rc || \
+ [ -f ${MAGERC} ] && source ${MAGERC} || \
- 	die "Your /etc/mage.rc is missing. Aborting."
+ 	die "Your ${MAGERC} is missing. Aborting."
  [ -f ${MLIBDIR}/mage4.functions.sh ] && \
  	source ${MLIBDIR}/mage4.functions.sh || \
-Line 54 
 export LC_ALL=C
+Line 55 
 export LC_ALL=C
  # 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."
-Line 82 
 print_usage()
+Line 83 
 print_usage()
  	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"
-Line 113 
 print_usage()
+Line 115 
 print_usage()
  showversion
  echo
- # before anything run mage_setup
- mage_setup || die "error in mage_setup()"
  # install method
  METHOD="$1"
-Line 127 
 if [[ ${METHOD} != upgrade ]] && \
+Line 126 
 if [[ ${METHOD} != upgrade ]] && \
  	[[ ${METHOD} != uppretend ]] && \
  	[[ ${METHOD} != srcuppretend ]] && \
  	[[ ${METHOD} != update ]] && \
+ 	[[ ${METHOD} != update-tarball ]] && \
  	[[ ${METHOD} != clean ]] && \
  	[[ ${METHOD} != version ]] && \
  	[[ ${METHOD} != search ]] && \
 Line 142 
 then
  	BUILDDIR=${MROOT}/${BUILDDIR}
  fi
+ # before anything run mage_setup
+ mage_setup || die "error in mage_setup()"
  case ${METHOD} in
  	download)
  		# first of all get the right pkg which going to be installed
-Line 153 
 case ${METHOD} in
+Line 156 
 case ${METHOD} in
  		# 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})"
-Line 180 
 case ${METHOD} in
+Line 186 
 case ${METHOD} in
  		# 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})"
-Line 206 
 case ${METHOD} in
+Line 215 
 case ${METHOD} in
  		# 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})"
-Line 239 
 case ${METHOD} in
+Line 251 
 case ${METHOD} in
  		# 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})"
-Line 278 
 case ${METHOD} in
+Line 293 
 case ${METHOD} in
  		# 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})"
-Line 365 
 case ${METHOD} in
+Line 383 
 case ${METHOD} in
  		# 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})"
-Line 387 
 case ${METHOD} in
+Line 408 
 case ${METHOD} in
  		syncmage
  		;;
+ 	update-tarball)
+ 		syncmage_tarball
+ 		;;
  	clean)
  		cleanpkg
  		;;

 Legend:



Removed from v.299
 


changed lines


 
Added in v.1269
 Legend:



Removed from v.299
 


changed lines


 
Added in v.1269
-Removed from v.299
+Added in v.1269