/[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 1214 by niro,
Fri Jan 28 21:46:34 2011 UTC
+revision 1318 by niro,
Fri May 27 19:48:35 2011 UTC
 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 219 
 install_files()
+Line 228 
 install_files()
  					"${user}" \
  					"${group}" \
  					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
- 						"${MROOT}${pathto}")" \
+ 					"${MROOT}${pathto}")" \
  					"${md5sum}"
  				;;
-Line 246 
 install_files()
+Line 255 
 install_files()
  					"${user}" \
  					"${group}" \
  					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
- 						"${dest_protected}")" \
+ 					"${dest_protected}")" \
  					"${md5sum}"
  				# update global MAGE_PROTECT_COUNTER
-Line 263 
 install_files()
+Line 272 
 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 354 
 install_blockdevices()
+Line 371 
 install_blockdevices()
  	# sets fieldseperator to "§" instead of " "
  	IFS=§
- 	while read pathto posix user group
+ 	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}"
+ 			chown "${user}:${group}" "${MROOT}${pathto}" b "${major}" "${minor}"
  		fi
  	done < ${BUILDDIR}/${pkgname}/.pipes
-Line 403 
 install_characterdevices()
+Line 420 
 install_characterdevices()
  		[ -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} ]]
-Line 467 
 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 1255 
 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 1303 
 fetch_packages()
+Line 1324 
 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 1357 
 syncmage_tarball()
+Line 1378 
 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 1364 
 syncmage_tarball()
+Line 1387 
 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 1373 
 syncmage_tarball()
+Line 1399 
 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 1400 
 syncmage_tarball()
+Line 1426 
 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 1410 
 syncmage_tarball()
+Line 1436 
 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 2595 
 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 3043 
 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.1214
 


changed lines


 
Added in v.1318
 Legend:



Removed from v.1214
 


changed lines


 
Added in v.1318
-Removed from v.1214
+Added in v.1318