/[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 287 by niro,
Thu Dec  1 12:40:21 2005 UTC
+revision 372 by niro,
Thu Apr 27 14:51:30 2006 UTC
 Line 1
  #!/bin/sh
  # Magellan Linux Installer (mage.sh)
- # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.9 2005-12-01 12:40:21 niro Exp $
+ # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.14 2006-04-27 14:51:30 niro Exp $
  # default die function
  die()
 Line 21 
 die()
  	source ${MLIBDIR}/mage4.functions.sh || \
  	die "mage functions missing"
- # for tests only
- #source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage.rc.global
- #source /etc/mage.rc
- #source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh
- #MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage
  ## only for tests -> normally in /etc/rc.d/init.d/functions
  COLRED="\033[1;6m\033[31m"
  COLGREEN="\033[1;6m\033[32m"
-Line 69 
 then
+Line 63 
 then
  fi
  # default messages
- showversion() {
+ showversion()
+ {
  	local MAGEVERSION="$(< ${MLIBDIR}/version)"
  	echo -en "Magellan Package Manager v${MAGEVERSION} "
  	echo -e  "-- Niels Rogalla (niro@magellan-linux.de)"
  }
- print_usage(){
+ print_usage()
- 	showversion
+ {
- 	echo
+ 	#showversion
+ 	#echo
  	echo "Usage: $(basename $0) [option] pkgname ..."
  	echo "Options:"
  	echo "    pretend         - pretends dependencies of a package"
-Line 102 
 print_usage(){
+Line 98 
 print_usage(){
  #	echo "NOINSTALL=yes $(basename $0) srcinstall PACKAGE"
  #	echo "Builds a Package with its dependencies, but won't install anything."
  #	echo
- 	echo "USE_UNSTABLE=true $(basename $0) [src]install PACKAGE"
+ 	echo "MAGE_DISTRIBUTION=unstable $(basename $0) [src]install PACKAGE"
  	echo "Overrides stable packages; you can install packages that are marked unstable."
  	echo
- 	echo "USE_TESTING=true $(basename $0) [src]install PACKAGE"
+ 	echo "MAGE_DISTRIBUTION=testing $(basename $0) [src]install PACKAGE"
  	echo "Overrides stable packages; you can install packages that are marked testing."
  	echo
  	echo "NOCOLORS=true $(basename $0) [src]install PACKAGE"
-Line 117 
 print_usage(){
+Line 113 
 print_usage(){
  showversion
  echo
- # before anything run mage_setup
- mage_setup || die "error in mage_setup()"
  # install method
  METHOD="$1"
-Line 146 
 then
+Line 139 
 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 157 
 case ${METHOD} in
+Line 153 
 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 184 
 case ${METHOD} in
+Line 183 
 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 210 
 case ${METHOD} in
+Line 212 
 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 243 
 case ${METHOD} in
+Line 248 
 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 282 
 case ${METHOD} in
+Line 290 
 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 369 
 case ${METHOD} in
+Line 380 
 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 396 
 case ${METHOD} in
+Line 410 
 case ${METHOD} in
  		;;
  	version)
- 		showversion
+ 		# showversion
+ 		exit 0
  		;;
  	regen-mage-tree)

 Legend:



Removed from v.287
 


changed lines


 
Added in v.372
 Legend:



Removed from v.287
 


changed lines


 
Added in v.372
-Removed from v.287
+Added in v.372