/[magellan-source]/branches/mage-next/src/mage.in

Diff of /branches/mage-next/src/mage.in

Parent Directory | Revision Log | View Patch Patch

-trunk/mage/usr/lib/mage/mage4.sh
revision 236 by niro,
Sat Sep 10 13:35:31 2005 UTC
+branches/mage-next/src/mage.in
revision 2620 by niro,
Tue Mar  4 15:42:54 2014 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.5 2005-09-10 13:35:31 niro Exp $
+ # $Id$
- # default die function
+ # set default variables
- die()
+ : ${MAGERC="@@SYSCONFDIR@@/mage.rc"}
- {
+ : ${MLIBDIR="@@MAGELIBDIR@@"}
- 	echo -e ${COLRED}"$@"${COLDEFAULT}
- 	exit 1
+ # first of all include common functions
- }
+ source ${MLIBDIR}/common.functions.sh
+ source @@SYSCONFDIR@@/mage.rc.global
- # include all needed files
+ source ${MAGERC}
- [ -f /etc/mage.rc.global ] &&  \
+ source ${MLIBDIR}/mage4.functions.sh
- 	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 ${MLIBDIR}/mage4.functions.sh ] && \
- 	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"
- COLYELLOW="\033[1;6m\033[33m"
- COLBLUE="\033[1;6m\033[34m"
- COLMAGENTA="\033[1;6m\033[35m"
- COLWHITE="\033[1;6m\033[37m"
- COLGRAY="\033[0;6m\033[37m"
- COLDEFAULT="\033[0m"
- if [[ ${NOCOLORS} = true ]]
- then
- 	COLRED=""
- 	COLGREEN=""
- 	COLYELLOW=""
- 	COLBLUE=""
- 	COLMAGENTA=""
- 	COLWHITE=""
- 	COLGRAY=""
- 	COLDEFAULT=""
- fi
  # export default path
  export PATH="${PATH}:${MLIBDIR}"
-Line 58 
 export LC_ALL=C
+Line 21 
 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-rsync ]] &&
+ 	[[ $1 != update-tarball ]]
  then
  	echo
  	echo "Please choose an profile from the mage tree."
- 	echo "ln -snf ${MAGEDIR}/profiles/profilename /etc/mage-profile"
+ 	echo "ln -snf ${MAGEDIR}/profiles/profilename @@SYSCONFDIR@@/mage-profile"
  	exit 1
  fi
  # default messages
- showversion() {
+ print_usage()
- 	local MAGEVERSION="$(< ${MLIBDIR}/version)"
+ {
+ 	#showversion
- 	echo -en "Magellan Package Manager v${MAGEVERSION} "
+ 	#echo
- 	echo -e  "-- Niels Rogalla (niro@magellan-linux.de)"
- }
- print_usage(){
- 	showversion
- 	echo
  	echo "Usage: $(basename $0) [option] pkgname ..."
  	echo "Options:"
- 	echo "     pretend        - pretends dependencies of a package"
+ 	echo "    pretend         - pretends dependencies of a package"
- 	echo "     srcpretend     - pretends dependencies of a package (build from source)"
+ 	echo "    srcpretend      - pretends dependencies of a package (build from source)"
- 	echo "     install        - installs a package"
+ 	echo "    install         - installs a package"
- 	echo "     srcinstall     - installs a package from source"
+ 	echo "    srcinstall      - installs a package from source"
- 	echo "     uninstall      - removes a package"
+ 	echo "    uninstall       - removes a package"
- 	echo "     update         - updates mage-tree"
+ 	echo "    update          - updates the mage-tree via default sync method"
- 	echo "     uppretend      - pretend dependencies for a system upgrade"
+ 	echo "    update-rsync    - updates the mage-tree via rsync"
- 	echo "     upgrade        - runs a complete system upgrade"
+ 	echo "    update-tarball  - updates the mage-tree via a tarball"
- 	echo "     srcuppretend   - pretend dependencies for a system upgrade from source"
+ 	echo "    uppretend       - pretend dependencies for a system upgrade"
- 	echo "     srcupgrade     - runs a complete system upgrade from source"
+ 	echo "    upgrade         - runs a complete system upgrade"
- 	echo "     search         - searches mage-tree for a package"
+ 	echo "    srcuppretend    - pretend dependencies for a system upgrade from source"
- 	echo "     clean          - removes *all* downloaded packages"
+ 	echo "    srcupgrade      - runs a complete system upgrade from source"
- 	echo "     unpack         - unpacks *all* needed package for 'foo'"
+ 	echo "    pretend-build-prerequisites - prints build prerequisites"
- 	echo "     download       - downloads *all* needed packages for 'foo'"
+ 	echo "    install-build-prerequisites - install build prerequisites"
- 	echo "     version        - prints version info"
+ 	echo "    run-preinstall  - runs preinstall part of an installed package"
+ 	echo "    run-postinstall - runs postinstall part of an installed package"
+ 	echo "    search          - searches mage-tree for a package"
+ 	echo "    clean           - removes *all* downloaded packages"
+ 	echo "    unpack          - unpacks *all* needed package for 'foo'"
+ 	echo "    download        - downloads *all* needed packages for 'foo'"
+ 	echo "    print-features  - prints all enabled mage-features"
+ 	echo "    version         - prints version info"
+ 	echo "    regen-mage-tree - regenerates the whole mage database (for devs only)"
  	echo
  	echo "Other options:"
  #	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 114 
 print_usage(){
+Line 82 
 print_usage(){
  showversion
  echo
- # before anything run mage_setup
- mage_setup || die "error in mage_setup()"
  # install method
  METHOD="$1"
- # initial unversionized packagename, gets overridden later
+ # initial unversionized packagename, gets overridden later on
  MAGENAME="$2"
- if [[ ${METHOD} != upgrade ]] && \
+ if [[ ${METHOD} != upgrade ]] &&
- 	[[ ${METHOD} != srcupgrade ]] && \
+ 	[[ ${METHOD} != srcupgrade ]] &&
- 	[[ ${METHOD} != uppretend ]] && \
+ 	[[ ${METHOD} != uppretend ]] &&
- 	[[ ${METHOD} != srcuppretend ]] && \
+ 	[[ ${METHOD} != srcuppretend ]] &&
- 	[[ ${METHOD} != update ]] && \
+ 	[[ ${METHOD} != update ]] &&
- 	[[ ${METHOD} != clean ]] && \
+ 	[[ ${METHOD} != update-rsync ]] &&
- 	[[ ${METHOD} != version ]] && \
+ 	[[ ${METHOD} != update-tarball ]] &&
- 	[[ ${METHOD} != search ]] && \
+ 	[[ ${METHOD} != clean ]] &&
- 	[[ ${METHOD} != regen-mage-tree ]]
+ 	[[ ${METHOD} != version ]] &&
+ 	[[ ${METHOD} != search ]] &&
+ 	[[ ${METHOD} != regen-mage-tree ]] &&
+ 	[[ ${METHOD} != print-features ]]
  then
  	[[ -z ${METHOD} ]] || [[ -z ${MAGENAME} ]] && print_usage && exit 1
  fi
+ # set PKGDIR and BUILDDIR to MROOT
+ if [[ -n ${MROOT} ]]
+ then
+ 	PKGDIR=${MROOT}/${PKGDIR}
+ 	BUILDDIR=${MROOT}/${BUILDDIR}
+ fi
+ # before anything run mage_setup
+ mage_setup || die "error in mage_setup()"
+ # load supported mage features
+ load_mage_features
+ # query debug mode
+ if mqueryfeature "debug"
+ then
+ 	depwalker_debug="--debug"
+ else
+ 	depwalker_debug=""
+ fi
  case ${METHOD} in
  	download)
+ 		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})"
-Line 146 
 case ${METHOD} in
+Line 136 
 case ${METHOD} in
  		[ -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}))
+ 		# 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
-Line 155 
 case ${METHOD} in
+Line 148 
 case ${METHOD} in
  		PBUILD="$(pkgname2pbuild ${PKGNAME})"
  		# get all dependencies of this package
- 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
+ 		ALLDEPS="$(${MLIBDIR}/depwalker \
  			--method install \
  			--pcat ${PCAT} \
  			--pname ${PNAME} \
  			--pver ${PVER} \
- 			--pbuild ${PBUILD})"
+ 			--pbuild ${PBUILD} \
+ 			${depwalker_debug})"
  		fetch_packages ${ALLDEPS} || die "fetching packages"
  		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
  		;;
  	srcdownload)
+ 		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})"
-Line 173 
 case ${METHOD} in
+Line 169 
 case ${METHOD} in
  		[ -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}))
+ 		# 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
-Line 182 
 case ${METHOD} in
+Line 181 
 case ${METHOD} in
  		PBUILD="$(pkgname2pbuild ${PKGNAME})"
  		# get all dependencies of this package
- 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
+ 		ALLDEPS="$(${MLIBDIR}/depwalker \
  			--method srcinstall \
  			--pcat ${PCAT} \
  			--pname ${PNAME} \
  			--pver ${PVER} \
- 			--pbuild ${PBUILD})"
+ 			--pbuild ${PBUILD} \
+ 			${depwalker_debug})"
  		fetch_packages ${ALLDEPS} || die "fetching packages"
  		;;
- 	pretend|srcpretend)
+ 	pretend|srcpretend|pretend-build-prerequisites)
  		# first of all get the right pkg which going to be installed
  		PCAT="$(pname2pcat ${MAGENAME})"
 Line 199 
 case ${METHOD} in
  		[ -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}))
+ 		# 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
-Line 216 
 case ${METHOD} in
+Line 219 
 case ${METHOD} in
  			exit 3
  		fi
  		# get all dependencies of this package
- 		${MLIBDIR}/depwalker.sh \
+ 		${MLIBDIR}/depwalker \
  			--method ${METHOD} \
  			--pcat ${PCAT} \
  			--pname ${PNAME} \
  			--pver ${PVER} \
- 			--pbuild ${PBUILD}
+ 			--pbuild ${PBUILD} \
+ 			${depwalker_debug}
  		;;
- 	install)
+ 	install|install-build-prerequisites)
+ 		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})"
-Line 232 
 case ${METHOD} in
+Line 238 
 case ${METHOD} in
  		[ -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}))
+ 		# 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
-Line 243 
 case ${METHOD} in
+Line 252 
 case ${METHOD} in
  		if is_installed ${PCAT}/${PNAME}-${PVER}-${PBUILD}
  		then
  			echo -en "Package "
- 			echo -en "${COLRED}${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
+ 			echo -en "${COLRED}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
  			echo -e  " already installed."
  			exit 3
  		fi
  		# get all dependencies of this package
- 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
+ 		ALLDEPS="$(${MLIBDIR}/depwalker \
  			--method ${METHOD} \
  			--pcat ${PCAT} \
  			--pname ${PNAME} \
  			--pver ${PVER} \
- 			--pbuild ${PBUILD})"
+ 			--pbuild ${PBUILD} \
+ 			${depwalker_debug})"
  		# first fetch all packages
  		fetch_packages ${ALLDEPS} || die "fetching packages"
  		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
- 		unpack_packages ${ALLDEPS} || die "unpacking packages"
  		install_packages ${ALLDEPS} || die "installing packages"
  		;;
  	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})"
-Line 271 
 case ${METHOD} in
+Line 282 
 case ${METHOD} in
  		[ -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}))
+ 		# 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
-Line 282 
 case ${METHOD} in
+Line 296 
 case ${METHOD} in
  		if is_installed ${PCAT}/${PNAME}-${PVER}-${PBUILD}
  		then
  			echo -en "Package "
- 			echo -en "${COLRED}${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
+ 			echo -en "${COLRED}${PCAT}/${PNAME}-${PVER}-${PBUILD}${COLDEFAULT}"
  			echo -e  " already installed."
  			exit 3
  		fi
  		# get all dependencies of this package
- 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
+ 		ALLDEPS="$(${MLIBDIR}/depwalker \
  			--method ${METHOD} \
  			--pcat ${PCAT} \
  			--pname ${PNAME} \
  			--pver ${PVER} \
- 			--pbuild ${PBUILD})"
+ 			--pbuild ${PBUILD} \
+ 			${depwalker_debug})"
  		install_packages --src-install ${ALLDEPS} || die "src-installing packages"
  		;;
  	uninstall)
- 			ALLDEPS="$(get_uninstall_candidates --pname ${MAGENAME})"
+ 		have_root_privileges || die "You must be root to run this operation."
- 			if [ -z "${ALLDEPS}" ]
- 			then
+ 		ALLDEPS="$(get_uninstall_candidates --pname ${MAGENAME})"
- 				die "No package installed named '${MAGENAME}'."
+ 		if [ -z "${ALLDEPS}" ]
- 			fi
+ 		then
- 			uninstall_packages ${ALLDEPS}
+ 			die "No package installed named '${MAGENAME}'."
+ 		fi
+ 		uninstall_packages ${ALLDEPS}
+ 		;;
+ 	run-preinstall|run-postinstall)
+ 		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
+ 		rerun_pkgfunctions --method "${METHOD//run-}" ${ALLDEPS}
  		;;
  	uppretend|srcuppretend)
- 		${MLIBDIR}/depwalker.sh \
+ 		${MLIBDIR}/depwalker \
+ 			--method ${METHOD} \
+ 			--pcat ${METHOD} \
+ 			--pname ${METHOD} \
+ 			--pver ${METHOD} \
+ 			--pbuild ${METHOD} \
+ 			${depwalker_debug}
+ 		;;
+ 	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 \
  			--method ${METHOD} \
  			--pcat ${METHOD} \
  			--pname ${METHOD} \
  			--pver ${METHOD} \
- 			--pbuild ${METHOD}
+ 			--pbuild ${METHOD} \
+ 			${depwalker_debug})"
+ 		# first fetch all packages
+ 		fetch_packages ${ALLDEPS} || die "fetching packages"
+ 		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
+ 		install_packages ${ALLDEPS} || die "installing packages"
  		;;
- 	upgrade|srcupgrade)
+ 	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 \
+ 		ALLDEPS="$(${MLIBDIR}/depwalker \
  			--method ${METHOD} \
  			--pcat ${METHOD} \
  			--pname ${METHOD} \
  			--pver ${METHOD} \
- 			--pbuild ${METHOD})"
+ 			--pbuild ${METHOD} \
+ 			${depwalker_debug})"
- 		echo "DEBUG: ${ALLDEPS}"
+ 		install_packages --src-install ${ALLDEPS} || die "src-installing packages"
  		;;
  	search)
-Line 334 
 case ${METHOD} in
+Line 385 
 case ${METHOD} in
  		;;
  	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})"
-Line 341 
 case ${METHOD} in
+Line 394 
 case ${METHOD} in
  		[ -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}))
+ 		# 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
-Line 350 
 case ${METHOD} in
+Line 406 
 case ${METHOD} in
  		PBUILD="$(pkgname2pbuild ${PKGNAME})"
  		# get all dependencies of this package
- 		ALLDEPS="$(${MLIBDIR}/depwalker.sh \
+ 		ALLDEPS="$(${MLIBDIR}/depwalker \
  			--method install \
  			--pcat ${PCAT} \
  			--pname ${PNAME} \
  			--pver ${PVER} \
- 			--pbuild ${PBUILD})"
+ 			--pbuild ${PBUILD} \
+ 			${depwalker_debug})"
  		fetch_packages ${ALLDEPS} || die "fetching packages"
  		md5sum_packages ${ALLDEPS} || die "md5 sum packages"
  		unpack_packages ${ALLDEPS} || die "unpacking packages"
  		;;
  	update)
+ 		have_root_privileges || die "You must be root to run this operation."
+ 		# default to tarball
+ 		[[ -z ${MAGE_UPDATE_METHOD} ]] && MAGE_UPDATE_METHOD="tarball"
+ 		case ${MAGE_UPDATE_METHOD} in
+ 			rsync) syncmage ;;
+ 			tarball) syncmage_tarball ;;
+ 			*) die "Unknown MAGE_UPDATE_METHOD defined." ;;
+ 		esac
+ 		;;
+ 	update-rsync)
+ 		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
  		;;
  	version)
- 		showversion
+ 		# showversion
+ 		exit 0
  		;;
  	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."
-Line 385 
 case ${METHOD} in
+Line 464 
 case ${METHOD} in
  		done
  		;;
+ 	print-features)
+ 		mprintfeatures
+ 		;;
  	*)
  		print_usage
  		;;

 Legend:



Removed from v.236
 


changed lines


 
Added in v.2620
 Legend:



Removed from v.236
 


changed lines


 
Added in v.2620
-Removed from v.236
+Added in v.2620