/[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 1087 by niro,
Mon Jun 28 18:46:57 2010 UTC
+revision 1548 by niro,
Tue Dec 27 10:00:34 2011 UTC
 Line 2
  # Magellan Linux Installer Functions (mage.functions.sh)
  # $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 $
+ 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"
+ COLBOLD="\033[1m"
+ COLDEFAULT="\033[0m"
+ if [[ ${NOCOLORS} = true ]]
+ then
+ 	COLRED=""
+ 	COLGREEN=""
+ 	COLYELLOW=""
+ 	COLBLUE=""
+ 	COLMAGENTA=""
+ 	COLWHITE=""
+ 	COLGRAY=""
+ 	COLBOLD=""
+ 	COLDEFAULT=""
+ fi
  mage_setup()
  {
  	[ ! -d ${MROOT}${INSTALLDB} ] && \
-Line 23 
 unpack_packages()
+Line 46 
 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 78 
 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 132 
 install_directories()
+Line 164 
 install_directories()
  		[ -z "${pathto}" ] && continue
  		[[ ${VERBOSE} = on ]] && echo -e "\t>>> DIR:  ${MROOT}${pathto}"
  		# monitors /etc/env.d -> env-rebuild
  		[[ ${pathto} = /etc/env.d ]] && export MAGE_ENV_REBUILD=true
-Line 219 
 install_files()
+Line 250 
 install_files()
  					"${user}" \
  					"${group}" \
  					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
- 						"${MROOT}${pathto}")" \
+ 					"${MROOT}${pathto}")" \
  					"${md5sum}"
  				;;
-Line 246 
 install_files()
+Line 277 
 install_files()
  					"${user}" \
  					"${group}" \
  					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
- 						"${dest_protected}")" \
+ 					"${dest_protected}")" \
  					"${md5sum}"
  				# update global MAGE_PROTECT_COUNTER
-Line 263 
 install_files()
+Line 294 
 install_files()
  					echo -en "${COLDEFAULT}"
  					echo " === FILE: ${MROOT}${pathto}"
  				fi
- 				# simply do nothing here
+ 				# 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 339 
 install_blockdevices()
+Line 378 
 install_blockdevices()
  	local pkgname="$1"
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	# sanity checks; abort if not given
-Line 352 
 install_blockdevices()
+Line 393 
 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 376 
 install_characterdevices()
+Line 422 
 install_characterdevices()
  	local posix
  	local major
  	local minor
+ 	local user
+ 	local group
  	local IFS
  	# sanity checks; abort if not given
-Line 389 
 install_characterdevices()
+Line 437 
 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 413 
 build_doinstall()
+Line 506 
 build_doinstall()
  	# sanity checks; abort if not given
  	[ -z "${pkgname}" ] && die "build_doinstall() \$pkgname not given."
  	# this is only a wrapper
  	# NOTE:
-Line 428 
 build_doinstall()
+Line 521 
 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 489 
 install_database_entry()
+Line 583 
 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 507 
 install_database_entry()
+Line 601 
 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 785 
 remove_files()
+Line 882 
 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 879 
 remove_blockdevices()
+Line 976 
 remove_blockdevices()
  {
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	local pcat
  	local pname
-Line 902 
 remove_blockdevices()
+Line 1001 
 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 916 
 remove_blockdevices()
+Line 1015 
 remove_blockdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
-Line 937 
 remove_characterdevices()
+Line 1036 
 remove_characterdevices()
  {
  	local pathto
  	local posix
+ 	local user
+ 	local group
  	local IFS
  	local pcat
  	local pname
-Line 960 
 remove_characterdevices()
+Line 1061 
 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 974 
 remove_characterdevices()
+Line 1075 
 remove_characterdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix
+ 	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
-Line 988 
 remove_characterdevices()
+Line 1089 
 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 1018 
 remove_directories()
+Line 1181 
 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 1075 
 remove_directories()
+Line 1238 
 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 1109 
 build_douninstall()
+Line 1272 
 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 1131 
 fetch_packages()
+Line 1294 
 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 1179 
 fetch_packages()
+Line 1346 
 fetch_packages()
  			echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "
  			[[ ${VERBOSE} = off ]] && opt="--quiet"
  			wget \
- 				${WGET_FETCH_OPTIONS} \
+ 				${wget_opts} \
  				--directory-prefix=${PKGDIR} \
  				${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
  			if [[ $? = 0 ]]
-Line 1220 
 syncmage()
+Line 1387 
 syncmage()
  	done
  	# clean up backup files (foo~)
- 	find ${MAGEDIR} -name *~ -exec rm '{}' ';'
+ 	find ${MAGEDIR} -name \*~ -exec rm '{}' ';'
  	# check if a newer mage version is available
  	is_newer_mage_version_available
-Line 1233 
 syncmage_tarball()
+Line 1400 
 syncmage_tarball()
  	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"
-Line 1240 
 syncmage_tarball()
+Line 1409 
 syncmage_tarball()
  	# 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
-Line 1249 
 syncmage_tarball()
+Line 1421 
 syncmage_tarball()
  		echo "fetching latest md5 from ${mymirr} ..."
  		[[ ${VERBOSE} = off ]] && opt="--quiet"
  		wget \
- 			${WGET_FETCH_OPTIONS} \
+ 			${wget_opts} \
  			--directory-prefix=${temp} \
  			${opt} ${mymirr}/rsync/tarballs/${latest_md5}
  		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
  		echo "fetching latest tarball from ${mymirr} ..."
  		wget \
- 			${WGET_FETCH_OPTIONS} \
+ 			${wget_opts} \
  			--directory-prefix=${temp} \
  			${opt} ${mymirr}/rsync/tarballs/${latest_tarball}
  		if [[ $? = 0 ]]
-Line 1276 
 syncmage_tarball()
+Line 1448 
 syncmage_tarball()
  		else
  			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
  			echo -n "checking md5sum... "
- 			( cd ${temp}; md5sum --check ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
+ 			( cd ${temp}; md5sum -c ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
  		fi
  		if [[ -d ${MAGEDIR} ]]
-Line 1286 
 syncmage_tarball()
+Line 1458 
 syncmage_tarball()
  			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 xjmf ${temp}/${latest_tarball} -C ${MAGEDIR%/*} || die "Unpacking tarball"
+ 		tar ${tar_opts} ${temp}/${latest_tarball} -C ${MAGEDIR%/*} || die "Unpacking tarball"
  		if [[ -d ${temp} ]]
  		then
-Line 1335 
 xtitleclean()
+Line 1514 
 xtitleclean()
  }
- # cuts full pathnames or versioniezed names down to basename
+ # cuts full pathnames or versionized names down to basename
  choppkgname()
  {
  	#we want this only if full name was used
-Line 1418 
 get_highest_magefile()
+Line 1597 
 get_highest_magefile()
  	local magefile
  	# do not list the content of a directory, only the name (-d)
- 	for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/*)
+ 	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)
-Line 1431 
 get_highest_magefile()
+Line 1610 
 get_highest_magefile()
  		fi
  	done
- # do not so anything
- # 	# stop here if HIGHEST_MAGEFILE is zero
- # 	# this package must be unstable or old
- # 	if [ -z "${HIGHEST_MAGEFILE}" ]
- # 	then
- # 		echo
- # 		echo -n "All packages named "
- # 		echo -en ${COLRED}\""${PKGNAME%-*-*-*}\""${COLDEFAULT}
- # 		echo -n " are marked "
- # 		echo -en ${COLRED}"*UNSTABLE*"${COLDEFAULT}
- # 		echo "."
- # 		echo "You need to declare USE_UNSTABLE=true to install this."
- # 		echo
- # 		echo "Example:"
- # 		echo "         USE_UNSTABLE=true mage install ${PKGNAME%-*-*-*}"
- # 		echo
- # 		echo "Be warned that these packages are not stable and may cause serious problems."
- # 		echo "You should know what you are doing, so don't complain about any damage."
- # 		echo
- # 		return 1
- # 	fi
  	echo "${HIGHEST_MAGEFILE}"
  	return 0
  }
-Line 1745 
 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 2304 
 mage_install()
+Line 2462 
 mage_install()
  		if [[ -n ${MAGE_TARGETS} ]]
  		then
  			# basic svn compat
- 			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+ 			if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
  			then
- 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+ 				for i in ${SMAGESCRIPTSDIR}/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
  				do
  					smage2file="${i}"
  				done
-Line 2317 
 mage_install()
+Line 2475 
 mage_install()
  		elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
  		then
  			# basic svn compat
- 			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+ 			if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
  			then
- 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
+ 				for i in ${SMAGESCRIPTSDIR}/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
  				do
  					smage2file="${i}"
  				done
-Line 2329 
 mage_install()
+Line 2487 
 mage_install()
  		else
  			# basic svn compat
- 			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+ 			if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
  			then
- 				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
+ 				for i in ${SMAGESCRIPTSDIR}/*/${pname}/${pname}-${pver}-${pbuild}.smage2
  				do
  					smage2file="${i}"
  				done
-Line 2470 
 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 2683 
 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 2917 
 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
+ }
+ have_root_privileges()
+ {
+ 	local retval
+ 	if [[ $(id -u) = 0 ]]
+ 	then
+ 		retval=0
+ 	else
+ 		retval=1
+ 	fi
+ 	return ${retval}
+ }

 Legend:



Removed from v.1087
 


changed lines


 
Added in v.1548
 Legend:



Removed from v.1087
 


changed lines


 
Added in v.1548
-Removed from v.1087
+Added in v.1548