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

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

Parent Directory | Revision Log | View Patch Patch

-revision 419 by niro,
Mon Jan 22 00:24:14 2007 UTC
+revision 1438 by niro,
Mon Jul 25 12:05:37 2011 UTC
 Line 1
  #!/bin/bash
  # Magellan Linux Installer Functions (mage.functions.sh)
- # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.26 2007-01-22 00:24:14 niro Exp $
+ # $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.38 2008-10-05 10:32:24 niro Exp $
  mage_setup()
  {
 Line 23 
 unpack_packages()
  	local pkgtype
  	local count_current
  	local count_total
+ 	local tar_opts
  	# get count of total packages
  	declare -i count_current=0
-Line 54 
 unpack_packages()
+Line 55 
 unpack_packages()
  			continue
  		fi
+ 		# busybox?
+ 		if need_busybox_support tar
+ 		then
+ 			tar_opts="xjf"
+ 		else
+ 			tar_opts="xjmf"
+ 		fi
  		echo -e " ${COLBLUE}***${COLDEFAULT} unpacking (${count_current}/${count_total}): ${pkg} ... "
- 		tar xjmf ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"
+ 		tar ${tar_opts} ${PKGDIR}/${pkg} -C ${BUILDDIR} || die "Unpacking package ${pkg}"
  	done
  	# add a crlf for a better view
-Line 198 
 install_files()
+Line 207 
 install_files()
  		is_config_protected "${pathto}"
  		retval="$?"
- 		# 0 - not protected        #
+ 		# 0 - not protected         #
- 		# 1 - error                #
+ 		# 1 - error                 #
- 		# 2 - protected            #
+ 		# 2 - protected             #
- 		# 3 - protected but masked #
+ 		# 3 - protected but masked  #
+ 		# 4 - protected but ignored #
  		case ${retval} in
  			# file is not protected - (over)write it
-Line 218 
 install_files()
+Line 228 
 install_files()
  					"${user}" \
  					"${group}" \
  					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
- 						"${MROOT}${pathto}")" \
+ 					"${MROOT}${pathto}")" \
  					"${md5sum}"
  				;;
-Line 245 
 install_files()
+Line 255 
 install_files()
  					"${user}" \
  					"${group}" \
  					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
- 						"${dest_protected}")" \
+ 					"${dest_protected}")" \
  					"${md5sum}"
  				# update global MAGE_PROTECT_COUNTER
  				(( MAGE_PROTECT_COUNTER++ ))
  				export MAGE_PROTECT_COUNTER
  				;;
+ 			# file is protected but ignored, delete the update/do nothing
+)
+ 				if [[ ${VERBOSE} = on ]]
+ 				then
+ 					echo -en "${COLRED}"
+ 					echo -n "! ignr "
+ 					echo -en "${COLDEFAULT}"
+ 					echo " === FILE: ${MROOT}${pathto}"
+ 				fi
+ 				# simply do nothing here - only fix mtime
+ 				fix_descriptor ${pkgname}/.files \
+ 					"${pathto}" \
+ 					"${posix}" \
+ 					"${user}" \
+ 					"${group}" \
+ 					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
+ 					"${MROOT}${pathto}")" \
+ 					"${md5sum}"
+ 				;;
  		esac
  	done < ${BUILDDIR}/${pkgname}/.files
-Line 298 
 install_symlinks()
+Line 328 
 install_symlinks()
  		ln -snf "${link}" "${MROOT}${pathto}"
- 		# fix mtime and db
+ # 		# fix mtime and db
- 		fix_descriptor ${pkgname}/.symlinks \
+ # 		fix_descriptor ${pkgname}/.symlinks \
- 			"${pathto}" \
+ # 			"${pathto}" \
- 			"${posix}" \
+ # 			"${posix}" \
- 			"${link}" \
+ # 			"${link}" \
- 			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
+ # 			"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
- 				"${MROOT}${pathto}")"
+ # 				"${MROOT}${pathto}")"
  	done < ${BUILDDIR}/${pkgname}/.symlinks
- 	# now copy the fixed file over the old one
+ # 	# now copy the fixed file over the old one
- 	[ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \
+ # 	[ -f ${BUILDDIR}/${pkgname}/.symlinks_fixed ] && \
- 		cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}
+ # 		cp -f ${BUILDDIR}/${pkgname}/.symlinks{_fixed,}
  	# very important: unsetting the '§' fieldseperator
  	IFS=$'\n'
-Line 326 
 install_blockdevices()
+Line 356 
 install_blockdevices()
  	local pkgname="$1"
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	# sanity checks; abort if not given
-Line 339 
 install_blockdevices()
+Line 371 
 install_blockdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix major minor user group
  	do
  		[ -z "${pathto}" ] && continue
  		[[ ${VERBOSE} = on ]] && echo -e "\t>>> PIPE: ${MROOT}${pathto}"
- 		mkfifo -m "${posix}" "${MROOT}$pathto"
+ 		mknod -m "${posix}" "${MROOT}${pathto}"
+ 		# make it optional atm !!
+ 		if [[ ! -z ${user} ]] && [[ ! -z ${group} ]]
+ 		then
+ 			chown "${user}:${group}" "${MROOT}${pathto}" b "${major}" "${minor}"
+ 		fi
  	done < ${BUILDDIR}/${pkgname}/.pipes
  	# very important: unsetting the '§' fieldseperator
-Line 363 
 install_characterdevices()
+Line 400 
 install_characterdevices()
  	local posix
  	local major
  	local minor
+ 	local user
+ 	local group
  	local IFS
  	# sanity checks; abort if not given
-Line 376 
 install_characterdevices()
+Line 415 
 install_characterdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix major minor
+ 	while read pathto posix major minor user group
  	do
  		[ -z "${pathto}" ] && continue
  		[[ ${VERBOSE} = on ]] && echo -e "\t>>> CHAR: ${MROOT}${pathto}"
- 		mknod -m ${posix} "${MROOT}${pathto}" c ${major} ${minor}
+ 		mknod -m ${posix} "${MROOT}${pathto}" b "${major}" "${minor}"
+ 		# make it optional atm !!
+ 		if [[ ! -z ${user} ]] && [[ ! -z ${group} ]]
+ 		then
+ 			chown "${user}:${group}" "${MROOT}${pathto}"
+ 		fi
  	done < ${BUILDDIR}/${pkgname}/.char
  	# very important: unsetting the '§' fieldseperator
  	IFS=$'\n'
  }
+ ###################################################
+ # function install_fifos                          #
+ #	install_fifos $PKGNAME                    #
+ ###################################################
+ install_fifos()
+ {
+ 	local pkgname="$1"
+ 	local pathto
+ 	local posix
+ 	local user
+ 	local group
+ 	local IFS
+ 	# sanity checks; abort if not given
+ 	[ -z "${pkgname}" ] && die "install_fifos() \$pkgname not given."
+ 	# check needed global vars
+ 	[ -z "${BUILDDIR}" ] && die "install_fifos() \$BUILDDIR not set."
+ 	# make it optional atm !!
+ 	#[ ! -f ${BUILDDIR}/${pkgname}/.fifo ] && die "install_fifos() .fifo not found"
+ 	[ ! -f ${BUILDDIR}/${pkgname}/.fifo ] && return
+ 	# sets fieldseperator to "§" instead of " "
+ 	IFS=§
+ 	while read pathto posix user group
+ 	do
+ 		[ -z "${pathto}" ] && continue
+ 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> FIFO: ${MROOT}${pathto}"
+ 		mkfifo -m "${posix}" "${MROOT}${pathto}"
+ 		chown "${user}:${group}" "${MROOT}${pathto}"
+ 	done < ${BUILDDIR}/${pkgname}/.fifo
+ 	# very important: unsetting the '§' fieldseperator
+ 	IFS=$'\n'
+ }
  ###################################################
  # function build_doinstall                        #
  #	build_doinstall $PKGNAME                  #
- # NOTE: this is an wrapper do install packages    #
+ # NOTE: this is an wrapper to install packages    #
  ###################################################
  build_doinstall()
  {
-Line 400 
 build_doinstall()
+Line 484 
 build_doinstall()
  	# sanity checks; abort if not given
  	[ -z "${pkgname}" ] && die "build_doinstall() \$pkgname not given."
  	# this is only a wrapper
  	# NOTE:
-Line 415 
 build_doinstall()
+Line 499 
 build_doinstall()
  	install_symlinks ${pkgname} || die "install symlinks ${pkgname}"
  	install_blockdevices ${pkgname} || die "install blockdevices ${pkgname}"
  	install_characterdevices ${pkgname} || die "install chardevices ${pkgname}"
+ 	install_fifos ${pkgname} || die "install fifos ${pkgname}"
  }
-Line 476 
 install_database_entry()
+Line 561 
 install_database_entry()
  	# create fake file descriptors
  	# used by virtual and source packages
- 	for i in .dirs .symlinks .files .pipes .char
+ 	for i in .dirs .symlinks .files .pipes .char .fifo
  	do
  		touch ${dbrecorddir}/${i}
  	done
-Line 494 
 install_database_entry()
+Line 579 
 install_database_entry()
  			# normal packages needs these files
  			local i
- 			for i in .char .dirs .files .pipes .symlinks
+ 			for i in .char .dirs .files .pipes .symlinks .fifo
  			do
- 				install -m 0644 ${BUILDDIR}/${pkgname}/${i} \
+ 				# make .fifo optional atm
- 					${dbrecorddir}/${i}
+ 				if [[ -f ${BUILDDIR}/${pkgname}/${i} ]]
+ 				then
+ 					install -m 0644 ${BUILDDIR}/${pkgname}/${i} ${dbrecorddir}/${i}
+ 				fi
  			done
  			;;
  	esac
-Line 772 
 remove_files()
+Line 860 
 remove_files()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_files() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_files() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_files() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_files() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 809 
 remove_files()
+Line 897 
 remove_files()
  				is_config_protected "${pathto}"
  				retval="$?"
- 				# 0 - not protected        #
+ 				# 0 - not protected         #
- 				# 1 - error                #
+ 				# 1 - error                 #
- 				# 2 - protected            #
+ 				# 2 - protected             #
- 				# 3 - protected but masked #
+ 				# 3 - protected but masked  #
+ 				# 4 - protected but ignored #
  				case ${retval} in
  					# file is not protected - delete it
-Line 831 
 remove_files()
+Line 920 
 remove_files()
  							echo " === FILE: ${MROOT}${pathto}"
  						fi
  						;;
+ 					# file is protected but ignored, delete the update/do nothing
+)
+ 						if [[ ${VERBOSE} = on ]]
+ 						then
+ 							echo -en "${COLRED}"
+ 							echo -n "! ignr "
+ 							echo -en "${COLDEFAULT}"
+ 							echo " === FILE: ${MROOT}${pathto}"
+ 						fi
+ 						# simply do nothing here
+ 						;;
  				esac
  				;;
 )
-Line 853 
 remove_blockdevices()
+Line 954 
 remove_blockdevices()
  {
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	local pcat
  	local pname
-Line 876 
 remove_blockdevices()
+Line 979 
 remove_blockdevices()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_blockdevices() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_blockdevices() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_blockdevices() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_blockdevices() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 890 
 remove_blockdevices()
+Line 993 
 remove_blockdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
-Line 911 
 remove_characterdevices()
+Line 1014 
 remove_characterdevices()
  {
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	local pcat
  	local pname
-Line 934 
 remove_characterdevices()
+Line 1039 
 remove_characterdevices()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_characterdevices() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_characterdevices() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_characterdevices() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_characterdevices() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 948 
 remove_characterdevices()
+Line 1053 
 remove_characterdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
-Line 962 
 remove_characterdevices()
+Line 1067 
 remove_characterdevices()
  ###################################################
+ # function remove_fifos                           #
+ #	remove_fifos $PKGNAME                     #
+ ###################################################
+ remove_fifos()
+ {
+ 	local pathto
+ 	local posix
+ 	local user
+ 	local group
+ 	local IFS
+ 	local pcat
+ 	local pname
+ 	local pver
+ 	local pbuild
+ 	local i
+ 	local pfull
+ 	IFS=$'\n'
+ 	# very basic getops
+ 	for i in $*
+ 	do
+ 		case $1 in
+ 			--pcat|-c) shift; pcat="$1" ;;
+ 			--pname|-n) shift; pname="$1" ;;
+ 			--pver|-v) shift; pver="$1" ;;
+ 			--pbuild|-b) shift; pbuild="$1" ;;
+ 		esac
+ 		shift
+ 	done
+ 	# sanity checks; abort if not given
+ 	[ -z "${pcat}" ] && die "remove_fifos() \$pcat not given."
+ 	[ -z "${pname}" ] && die "remove_fifos() \$pname not given."
+ 	[ -z "${pver}" ] && die "remove_fifos() \$pver not given."
+ 	[ -z "${pbuild}" ] && die "remove_fifos() \$pbuild not given."
+ 	pfull="${pcat}/${pname}-${pver}-${pbuild}"
+ 	# check needed global vars
+ 	[ -z "${BUILDDIR}" ] && die "remove_fifos() \$BUILDDIR not set."
+ 	# make it optional atm !!
+ 	#[ ! -f ${MROOT}${INSTALLDB}/${pfull}/.fifo ] && die "remove_fifos() .fifo not found"
+ 	[ ! -f ${MROOT}${INSTALLDB}/${pfull}/.fifo ] && return
+ 	# sets fieldseperator to "§" instead of " "
+ 	IFS=§
+ 	while read pathto posix user group
+ 	do
+ 		[ -z "${pathto}" ] && continue
+ 		[[ ${VERBOSE} = on ]] && echo -e "\t<<< FIFO: ${MROOT}${pathto}"
+ 		rm "${MROOT}${pathto}"
+ 	done < ${MROOT}${INSTALLDB}/${pfull}/.fifo
+ 	# very important: unsetting the '§' fieldseperator
+ 	IFS=$'\n'
+ }
+ ###################################################
  # function remove_direcories                      #
  #	remove_direcories $PKGNAME                #
  ###################################################
-Line 992 
 remove_directories()
+Line 1159 
 remove_directories()
  	done
  	# sanity checks; abort if not given
- 	[ -z "${pcat}" ] && die "remove_symlinks() \$pcat not given."
+ 	[ -z "${pcat}" ] && die "remove_directories() \$pcat not given."
- 	[ -z "${pname}" ] && die "remove_symlinks() \$pname not given."
+ 	[ -z "${pname}" ] && die "remove_directories() \$pname not given."
- 	[ -z "${pver}" ] && die "remove_symlinks() \$pver not given."
+ 	[ -z "${pver}" ] && die "remove_directories() \$pver not given."
- 	[ -z "${pbuild}" ] && die "remove_symlinks() \$pbuild not given."
+ 	[ -z "${pbuild}" ] && die "remove_directories() \$pbuild not given."
  	pfull="${pcat}/${pname}-${pver}-${pbuild}"
  	# check needed global vars
-Line 1049 
 remove_directories()
+Line 1216 
 remove_directories()
  ###################################################
  # function build_douninstall                      #
  #	build_douninstall $PKGNAME                #
- # NOTE: this is an wrapper do remove packages     #
+ # NOTE: this is an wrapper to remove packages     #
  ###################################################
  build_douninstall()
  {
-Line 1083 
 build_douninstall()
+Line 1250 
 build_douninstall()
  	# !! we use § as field seperator !!
  	# doing so prevent us to get errors by filenames with spaces
- 	for i in symlinks files blockdevices characterdevices directories
+ 	for i in symlinks files blockdevices characterdevices directories fifos
  	do
  		remove_${i} \
  			--pcat "${pcat}" \
-Line 1105 
 fetch_packages()
+Line 1272 
 fetch_packages()
  	local opt
  	local count_current
  	local count_total
+ 	local wget_opts
  	[ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."
+ 	# filter wget command if busybox was found
+ 	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
  	# get count of total packages
  	declare -i count_current=0
  	declare -i count_total=0
-Line 1153 
 fetch_packages()
+Line 1324 
 fetch_packages()
  			echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "
  			[[ ${VERBOSE} = off ]] && opt="--quiet"
  			wget \
- 				--passive-ftp \
+ 				${wget_opts} \
- 				--tries 3 \
- 				--continue \
- 				--progress bar \
  				--directory-prefix=${PKGDIR} \
  				${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
  			if [[ $? = 0 ]]
-Line 1197 
 syncmage()
+Line 1365 
 syncmage()
  	done
  	# clean up backup files (foo~)
- 	find ${MAGEDIR} -name *~ -exec rm '{}' ';'
+ 	find ${MAGEDIR} -name \*~ -exec rm '{}' ';'
- 	# check if an newer mage version is available
+ 	# check if a newer mage version is available
  	is_newer_mage_version_available
  }
+ syncmage_tarball()
+ {
+ 	local latest_tarball
+ 	local latest_md5
+ 	local temp="$(mktemp -d)"
+ 	local mirr mymirr
+ 	local opt
+ 	local tar_opts
+ 	local wget_opts
+ 	# try to get the md5 marked as latest on the server
+ 	latest_md5="mage-latest.md5"
+ 	# try to get the tarball marked as latest on the server
+ 	latest_tarball="mage-latest.tar.bz2"
+ 	# filter wget command if busybox was found
+ 	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
+ 	for mirr in ${MIRRORS}
+ 	do
+ 		# path without distribution
+ 		mymirr="${mirr%/*}"
+ 		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 		echo "fetching latest md5 from ${mymirr} ..."
+ 		[[ ${VERBOSE} = off ]] && opt="--quiet"
+ 		wget \
+ 			${wget_opts} \
+ 			--directory-prefix=${temp} \
+ 			${opt} ${mymirr}/rsync/tarballs/${latest_md5}
+ 		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 		echo "fetching latest tarball from ${mymirr} ..."
+ 		wget \
+ 			${wget_opts} \
+ 			--directory-prefix=${temp} \
+ 			${opt} ${mymirr}/rsync/tarballs/${latest_tarball}
+ 		if [[ $? = 0 ]]
+ 		then
+ 			break
+ 		else
+ 			continue
+ 		fi
+ 	done
+ 	if [[ -f ${temp}/${latest_tarball} ]]
+ 	then
+ 		# check md5
+ 		if [[ ! -f ${temp}/${latest_md5} ]]
+ 		then
+ 			die "md5 is missing ... aborting"
+ 		else
+ 			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 			echo -n "checking md5sum... "
+ 			( cd ${temp}; md5sum -c ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
+ 		fi
+ 		if [[ -d ${MAGEDIR} ]]
+ 		then
+ 			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 			echo "cleaning old mage-tree ${MAGEDIR}..."
+ 			rm -rf ${MAGEDIR}
+ 		fi
+ 		if need_busybox_support tar
+ 		then
+ 			tar_opts="xjf"
+ 		else
+ 			tar_opts="xjmf"
+ 		fi
+ 		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 		echo "updating mage-tree from tarball ..."
+ 		# unpack in dirname of MAGEDIR, as the tarball has already the mage
+ 		tar ${tar_opts} ${temp}/${latest_tarball} -C ${MAGEDIR%/*} || die "Unpacking tarball"
+ 		if [[ -d ${temp} ]]
+ 		then
+ 			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+ 			echo "cleaning temp-files ..."
+ 			rm -rf ${temp}
+ 		fi
+ 		# check if a newer mage version is available
+ 		is_newer_mage_version_available
+ 	else
+ 		die "Could not fetch the latest tarball ... aborting"
+ 	fi
+ }
  cleanpkg()
  {
  	if [ -d "${PKGDIR}" ]
-Line 1315 
 get_highest_magefile()
+Line 1574 
 get_highest_magefile()
  	local PNAME="$2"
  	local magefile
- 	for magefile in $(ls --format=single-column -v ${MAGEDIR}/${PCAT}/${PNAME}/*)
+ 	# do not list the content of a directory, only the name (-d)
+ 	for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/* 2> /dev/null)
  	do
+ 		[[ -z ${magefile} ]] && continue
  		# we exclude subdirs (for stuff like a md5sum dir)
- 		[ -d ${magefile} ] && continue
+ 		[[ -d ${magefile} ]] && continue
  		if check_stable_package ${magefile}
  		then
  			HIGHEST_MAGEFILE=${magefile}
-Line 1363 
 get_highest_magefile()
+Line 1624 
 get_highest_magefile()
  #        1 - error                                #
  #        2 - protected                            #
  #        3 - protected but masked                 #
+ #        4 - protected but ignored                #
  #                                                 #
  ###################################################
  is_config_protected()
-Line 1371 
 is_config_protected()
+Line 1633 
 is_config_protected()
  	local TEST
  	local PROTECTED
  	local IFS
+ 	local i
+ 	local x
  	EXPFILE="${MROOT}$1"
  	# file does not exist; it can be written
- 	[ ! -e ${EXPFILE} ] && return 0
+ 	[[ ! -e ${EXPFILE} ]] && return 0
  	# to be safe; it may be '§'
  	IFS=' '
- 	# check ob in config protect
+ 	# check if config protected
  	for i in ${CONFIG_PROTECT}
  	do
- 		# ersetzen von $i nur wenn am anfang der variable
+ 		# only replace $i in the beginning of the variable
  		TEST="${EXPFILE/#${MROOT}${i}/Protected}"
- 		if [ "${TEST}" != "${EXPFILE}" ]
+ 		if [[ ${TEST} != ${EXPFILE} ]]
  		then
- 			# setzen das es protected ist
+ 			# file is config proteced
  			PROTECTED=TRUE
- 			# check ob nicht doch maskiert
+ 			# check if not masked
  			for x in ${CONFIG_PROTECT_MASK}
  			do
  				TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"
- 				if [ "${TEST}" != "${EXPFILE}" ]
+ 				if [[ ${TEST} != ${EXPFILE} ]]
  				then
  					PROTECTED=MASKED
  				fi
  			done
+ 			# check if not ignored
+ 			for x in ${CONFIG_PROTECT_IGNORE}
+ 			do
+ 				TEST="${EXPFILE/#${MROOT}${x}/Protect_Ignored}"
+ 				if [[ ${TEST} != ${EXPFILE} ]]
+ 				then
+ 					PROTECTED=IGNORED
+ 				fi
+ 			done
  		fi
  	done
-Line 1413 
 is_config_protected()
+Line 1687 
 is_config_protected()
  			#echo "I'm protected, but masked - delete me"
  			return 3
  			;;
+ 		IGNORED)
+ 			#echo "I'm protected, but ignored - keep me, del update"
+ 			return 4
+ 			;;
  		*)
  			#echo "delete me"
  			return 0
-Line 1430 
 is_config_protected()
+Line 1708 
 is_config_protected()
  ###################################################
  count_protected_files()
  {
- 	${MLIBDIR}/writeprotected "$1"
+ 	local file="$1"
+ 	local dirname="${file%/*}"
+ 	local filename="${file##*/}"
+ 	local count
+ 	local output
+ 	local i
+ 	declare -i count=0
+ 	# check if there are already protected files
+ 	for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |
+ 		sed -e "s:\(^.*/\)\(._cfg*_\)\(/.*$\):\1\2\3\%\2\%\3:" |
+ 		sort -t'%' -k3 -k2 | cut -f1 -d'%')
+ 	do
+ 		count=$(echo ${oldpretected} | cut -d_ -f2 | sed -e "s:cfg::")
+ 	done
+ 	(( count ++ ))
+ 	# fill output up with zeros
+ 	for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
+ 	output="${output}${count}"
+ 	echo "${output}"
  }
  # call with
-Line 1447 
 get_uninstall_candidates()
+Line 1747 
 get_uninstall_candidates()
  	local list
  	local pcatdir
  	local protected
+ 	local i
  	# very basic getops
  	for i in $*
-Line 1601 
 virtuals_add()
+Line 1902 
 virtuals_add()
  #deletes pakages from virtual database
  #$1 virtualname; $2 pkgname
- virtuals_del() {
+ virtuals_del()
+ {
  	local virtualname="$1"
  	local pkgname="$2"
-Line 1708 
 minclude()
+Line 2010 
 minclude()
  {
  	local i
- 	if [[ -n $@ ]]
+ 	if [[ -n $* ]]
  	then
- 		for i in $@
+ 		for i in $*
  		do
  			[[ ${MAGEDEBUG} = on ]] && \
  				echo "--- Including ${MAGEDIR}/include/${i}.minc"
-Line 1724 
 sminclude()
+Line 2026 
 sminclude()
  {
  	local i
- 	if [ -n "$@" ]
+ 	if [[ -n $* ]]
  	then
- 		for i in $@
+ 		for i in $*
  		do
  			echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
  			source ${SMAGESCRIPTSDIR}/include/${i}.sminc
-Line 2035 
 get_value_from_magefile()
+Line 2337 
 get_value_from_magefile()
  	local SDEPEND
  	local PROVIDE
  	local PKGTYPE
+ 	local MAGE_TARGETS
+ 	local SPLIT_PACKAGE_BASE
  	local preinstall
  	local postinstall
  	local preremove
-Line 2081 
 mage_install()
+Line 2385 
 mage_install()
  	local count_current
  	local magefile
  	local src_install
+ 	local i
  	# very basic getops
  	for i in $*
-Line 2154 
 mage_install()
+Line 2459 
 mage_install()
  			echo B:${pbuild}
  		fi
- 		smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+ 		if [[ -n ${MAGE_TARGETS} ]]
+ 		then
+ 			# basic svn compat
+ 			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+ 			then
+ 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+ 				do
+ 					smage2file="${i}"
+ 				done
+ 			else
+ 				smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+ 			fi
+ 		elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
+ 		then
+ 			# basic svn compat
+ 			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+ 			then
+ 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
+ 				do
+ 					smage2file="${i}"
+ 				done
+ 			else
+ 				smage2file=${SMAGESCRIPTSDIR}/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
+ 			fi
+ 		else
+ 			# basic svn compat
+ 			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+ 			then
+ 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
+ 				do
+ 					smage2file="${i}"
+ 				done
+ 			else
+ 				smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+ 			fi
+ 		fi
  		if [ -f "${smage2file}" ]
  		then
  			echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
-Line 2285 
 md5sum_packages()
+Line 2628 
 md5sum_packages()
  		then
  			echo -ne "${COLBLUE} *** ${COLDEFAULT}"
  			echo -ne "checking md5sum (${count_current}/${count_total}): "
- 			( cd ${PKGDIR}; md5sum --check ${md5file}) || die "md5 for ${pkgfile} failed"
+ 			( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed"
  		else
  			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
  			echo -e "!! no md5sum file found for ${pkgfile} :("
-Line 2430 
 mage_uninstall()
+Line 2773 
 mage_uninstall()
  	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
  	echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
- 	magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
+ 	magefile="${MROOT}${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
  	source ${magefile}
  	## preremove scripts
-Line 2498 
 mage_uninstall()
+Line 2841 
 mage_uninstall()
  	unset -f postremove
  }
- show_etc_update_mesg() {
+ show_etc_update_mesg()
+ {
  	[ ${MAGE_PROTECT_COUNTER} -eq 0 ] && return 0
  	echo
-Line 2528 
 pkgsearch()
+Line 2872 
 pkgsearch()
  	local all_installed
  	local ipver
  	local ipbuild
+ 	local latest_available
+ 	local depsfull
+ 	local sdepsfull
+ 	local deps
+ 	local sdeps
+ 	local dep
+ 	local sign
  	# only names no versions
  	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*'| sed '/profiles/d' | sed '/includes/d')"
-Line 2545 
 pkgsearch()
+Line 2896 
 pkgsearch()
  		# get highest version available
  		magefile=$(get_highest_magefile ${pcat} ${pname})
- 		# now get all needed infos to print a nice output
+ 		if [[ ! -z ${magefile} ]]
- 		pver="$(magename2pver ${magefile})"
+ 		then
- 		pbuild="$(magename2pbuild ${magefile})"
+ 			# now get all needed infos to print a nice output
- 		state="$(get_value_from_magefile STATE ${magefile})"
+ 			pver="$(magename2pver ${magefile})"
- 		description="$(get_value_from_magefile DESCRIPTION ${magefile})"
+ 			pbuild="$(magename2pbuild ${magefile})"
- 		homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
+ 			state="$(get_value_from_magefile STATE ${magefile})"
+ 			description="$(get_value_from_magefile DESCRIPTION ${magefile})"
+ 			homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
+ 			# all installed
+ 			for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
+ 			do
+ 				ipver="$(magename2pver ${i})"
+ 				ipbuild="$(magename2pbuild ${i})"
+ 				if [[ -z ${all_installed} ]]
+ 				then
+ 					all_installed="${ipver}-${ipbuild}"
+ 				else
+ 					all_installed="${all_installed} ${ipver}-${ipbuild}"
+ 				fi
+ 			done
+ 			[[ -z ${all_installed} ]] && all_installed="none"
+ 			case ${state} in
+ 				stable) state=${COLGREEN}"[s] ";;
+ 				testing) state=${COLYELLOW}"[t] ";;
+ 				unstable) state=${COLRED}"[u] ";;
+ 				old) state=${COLGRAY}"[o] ";;
+ 			esac
- 		# all installed
+ 			latest_available="${pver}-${pbuild}"
- 		for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
+ 		else
- 		do
+ 			# package is masked
- 			ipver="$(magename2pver ${i})"
+ 			state="${COLRED}[m] "
- 			ipbuild="$(magename2pbuild ${i})"
+ 			latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"
+ 		fi
- 			if [[ -z ${all_installed} ]]
+ 		depsfull="$(get_value_from_magefile DEPEND ${magefile})"
- 			then
+ 		sdepsfull="$(get_value_from_magefile SDEPEND ${magefile})"
- 				all_installed="${ipver}-${ipbuild}"
- 			else
- 				all_installed="${all_installed} ${ipver}-${ipbuild}"
- 			fi
- 		done
- 		[[ -z ${all_installed} ]] && all_installed="none"
- 		case ${state} in
+ 		while read sign dep
- 			stable) state=${COLGREEN}"[s] ";;
+ 		do
- 			testing) state=${COLYELLOW}"[t] ";;
+ 			case ${dep} in
- 			unstable) state=${COLRED}"[u] ";;
+ 				"") continue;;
- 			old) state=${COLGRAY}"[o] ";;
+ 			esac
- 		esac
+ 			deps="${deps} $(basename ${dep%-*})"
+ 		done << EOF
+ ${depsfull}
+ EOF
+ 		while read sign dep
+ 		do
+ 			case ${dep} in
+ 				"") continue;;
+ 			esac
+ 			sdeps="${sdeps} $(basename ${dep%-*})"
+ 		done << EOF
+ ${sdepsfull}
+ EOF
  		echo -e "${state}${pcat}/${pname}"${COLDEFAULT}
- 		echo "      Latest available:   ${pver}-${pbuild}"
+ 		echo -e "      Latest available:   ${latest_available}"
  		echo "      Installed versions: ${all_installed}"
  		echo "      Description: ${description}"
  		echo "      Homepage: ${homepage}"
+ 		echo "      Depends: ${deps}"
+ 		echo "      SDepends: ${sdeps}"
  		echo
  		unset pcat
-Line 2592 
 pkgsearch()
+Line 2979 
 pkgsearch()
  		unset all_installed
  		unset ipver
  		unset ipbuild
+ 		unset depsfull
+ 		unset sdepsfull
+ 		unset deps
+ 		unset sdeps
+ 		unset dep
+ 		unset sign
  	done
  }
-Line 2634 
 blacklisted()
+Line 3027 
 blacklisted()
  	[[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable
  	[[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing
- 	local EXCLUDED="${MROOT}/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
+ 	# support both types for the moment
+ 	if [[ -f /etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION} ]]
+ 	then
+ 		local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
+ 	else
+ 		local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}"
+ 	fi
  	# return 0 if the list not exist; nothin is masked
  	[[ ! -f ${EXCLUDED} ]] && return 0
-Line 2677 
 EOF
+Line 3076 
 EOF
  	return 0
  }
+ # need_busybox_support ${cmd}
+ # return 0 (no error = needs busybox support) or return 1 (error = no busybox support required)
+ need_busybox_support()
+ {
+ 	local cmd
+ 	cmd="$1"
+ 	if [[ -x /bin/busybox ]]
+ 	then
+ 		if [[ $(readlink $(which ${cmd})) = /bin/busybox ]]
+ 		then
+ 			# needs busybox support
+ 			return 0
+ 		fi
+ 	fi
+ 	# no busybox
+ 	return 1
+ }
+ # busybox_filter_wget_options ${wget_opts}
+ busybox_filter_wget_options()
+ {
+ 	local opts="$@"
+ 	local i
+ 	local fixed_opts
+ 	if need_busybox_support wget
+ 	then
+ 		for i in ${opts}
+ 		do
+ 			# show only the allowed ones
+ 			case ${i} in
+ 				-c|--continue) fixed_opts+=" -c" ;;
+ 				-s|--spider) fixed_opts+=" -s" ;;
+ 				-q|--quiet) fixed_opts+=" -q" ;;
+ 				-O|--output-document) shift; fixed_opts+=" -O $1" ;;
+ 				--header) shift; fixed_opts+=" --header $1" ;;
+ 				-Y|--proxy) shift; fixed_opts+=" -Y $1" ;;
+ 				-P) shift; fixed_opts+=" -P $1" ;;
+ 				--no-check-certificate) fixed_opts+=" --no-check-certificate ${i}" ;;
+ 				-U|--user-agent) shift; fixed_opts+=" -U ${i}" ;;
+ 				# simply drop all other opts
+ 				*) continue ;;
+ 			esac
+ 		done
+ 		echo "${fixed_opts}"
+ 	else
+ 		echo "${opts}"
+ 	fi
+ }

 Legend:



Removed from v.419
 


changed lines


 
Added in v.1438
 Legend:



Removed from v.419
 


changed lines


 
Added in v.1438
-Removed from v.419
+Added in v.1438