/[magellan-source]/branches/mage-next/src/mage4.functions.sh

Diff of /branches/mage-next/src/mage4.functions.sh

Parent Directory | Revision Log | View Patch Patch

-revision 1599 by niro,
Fri Dec 30 10:07:18 2011 UTC
+revision 1963 by niro,
Fri Oct 26 21:14:51 2012 UTC
 Line 66 
 mchecksum()
  	case ${method} in
  		md5) cmd="md5sum" ;;
  		sha256) cmd="sha256sum" ;;
- 		*) die "mchecksum(): unkown method '${method}'" ;;
+ 		*) die "mchecksum(): unknown method '${method}'" ;;
  	esac
  	if [[ -d ${rundir} ]]
  	then
  		pushd ${rundir} &> /dev/null
- 		${cmd} -c ${file} &> /dev/null
+ 		# be verbose here
+ 		${cmd} -c ${file} #&> /dev/null
  		retval="$?"
  		popd &> /dev/null
  	else
-Line 82 
 mchecksum()
+Line 83 
 mchecksum()
  	return "${retval}"
  }
+ mcheckemptydir()
+ {
+ 	local dir="$1"
+ 	local retval=1
+ 	if [[ ! -d ${dir} ]]
+ 	then
+ 		echo "mcheckemptydir(): '${dir}' is not a directory!"
+ 		retval=3
+ 	else
+ 		shopt -s nullglob dotglob
+ 		files=( ${dir}/* )
+ 		(( ${#files[*]} )) || retval=0
+ 		shopt -u nullglob dotglob
+ 	fi
+ 	return ${retval}
+ }
  unpack_packages()
  {
  	local list="$@"
-Line 151 
 fix_mtime()
+Line 171 
 fix_mtime()
  	mtime=$(stat -c %Y "${reference}")
  	touch \
  		--no-create \
+ 		--no-dereference \
  		--time=mtime \
- 		--reference "${reference}" \
+ 		--reference="${reference}" \
  		"${pathto}"
  	echo "${mtime}"
-Line 394 
 install_symlinks()
+Line 415 
 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
-Line 787 
 compare_mtime()
+Line 808 
 compare_mtime()
  	mtime="$(stat -c %Y ${MROOT}${INSTALLDB}/${pfull}/.mtime)"
- 	# if $pathto is a symlink than compare linked binary
+ 	# no extra handlink for symlinks anymore as fix_mtime
- 	if [ -L "${MROOT}${pathto}" ]
+ 	# uses --no-dereference, compare directly
- 	then
+ 	x=$(stat -c %Y "${MROOT}${pathto}")
- 		# readlink -f resolves full path of linked file
- 		x="$(readlink -f "${MROOT}${pathto}")"
- 		# abort if target does not exists
- 		# we keep safe here, theoretically the link can removed
- 		[ ! -e "${x}" ] && return 1
- 		x=$(stat -c %Y "${x}")
- 	else
- 		x=$(stat -c %Y "${MROOT}${pathto}")
- 	fi
  	[[ ${mtime} = ${x} ]] && return 0
-Line 1401 
 mdownload()
+Line 1411 
 mdownload()
  	real_uris="$(convertmirrors ${uri})"
  	# verbose or not
- 	mqueryfeature "!verbose" && wget_opts="--quiet"
+ 	mqueryfeature "!verbose" && wget_opts+=" --quiet"
  	# filter wget options if busybox was found
- 	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
+ 	wget_opts+=" $(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
  	# create outputdir
  	[[ ! -d ${outputdir} ]] && install -d "${outputdir}"
-Line 1545 
 syncmage_tarball()
+Line 1555 
 syncmage_tarball()
  	for mirr in ${MIRRORS}
  	do
  		# path without distribution
- 		mymirr="${mirr%/*}"
+ 		# (only for stable|testing|unstable and not DISTROTAG)
+ 		case ${mirr##*/} in
+ 			stable|testing|unstable) mymirr="${mirr%/*}";;
+ 			*) mymirr="${mirr}";;
+ 		esac
  		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
  		echo "fetching latest md5 from ${mymirr} ..."
-Line 1579 
 syncmage_tarball()
+Line 1593 
 syncmage_tarball()
  		else
  			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
  			echo -n "checking md5sum... "
- 			( cd ${temp}; md5sum -c ${latest_md5} ) || die "md5 for ${latest_tarball} failed"
+ 			mchecksum --rundir "${temp}" --file "${latest_md5}" --method 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}
+ 			# honor mountpoints and empty dirs
+ 			if mountpoint -q ${MAGEDIR}
+ 			then
+ 				if ! mcheckemptydir ${MAGEDIR}
+ 				then
+ 					find ${MAGEDIR} -mindepth 1 -maxdepth 1 | xargs --no-run-if-empty rm -r
+ 				fi
+ 			else
+ 				rm -rf ${MAGEDIR}
+ 			fi
  		fi
  		if need_busybox_support tar
-Line 1645 
 xtitleclean()
+Line 1668 
 xtitleclean()
  }
- # cuts full pathnames or versionized names down to basename
+ # unused?
- choppkgname()
+ #
- {
+ # # cuts full pathnames or versionized names down to basename
- 	#we want this only if full name was used
+ # choppkgname()
- 	if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
+ # {
- 	then
+ # 	#we want this only if full name was used
- 		#cuts ARCH and PBUILD
+ # 	if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
- 		#ARCH comes from ${MAGERC}
+ # 	then
- 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")
+ # 		#cuts ARCH and PBUILD
+ # 		#ARCH comes from ${MAGERC}
+ # 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}$(print_distrotag)-r*.::g")
+ #
+ # 		#cuts version number
+ # 		MAGENAME=$(basename ${MAGENAME%-*} .mage)
+ # 	fi
+ # }
- 		#cuts version number
- 		MAGENAME=$(basename ${MAGENAME%-*} .mage)
- 	fi
- }
  # get_categorie $PNAME, returns CATEGORIE
  # $1=pname
-Line 1844 
 count_protected_files()
+Line 1870 
 count_protected_files()
  	local filename="${file##*/}"
  	local count
  	local output
+ 	local oldprotected
  	local i
+ 	local x
- 	declare -i count=0
+ 	# hack; do not honor a global set IFS like '§'
+ 	local IFS
+ 	count=0
  	# check if there are already protected files
- 	for oldpretected in $(find ${dirname} -iname "._cfg????_${filename}" |
+ 	for oldprotected 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::")
+ 		count="$(echo ${oldprotected} | sed 's:.*\/._cfg\(.*\)_.*:\1:')"
+ 	done
+ 	# convert 0001 -> 1; 0120 -> 120 etc
+ 	# use bash internal base functions to this task
+ 	x="$((10#${count}))"
+ 	for (( i=0; i<x; i++ ))
+ 	do
+ 		if [[ ${count:${i}:1} != 0 ]]
+ 		then
+ 			count="${count:${i}}"
+ 			break
+ 		fi
  	done
- 	(( count ++ ))
+ 	count="$(( ${count}+1 ))"
  	# fill output up with zeros
  	for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
-Line 2759 
 md5sum_packages()
+Line 2803 
 md5sum_packages()
  		then
  			echo -ne "${COLBLUE} *** ${COLDEFAULT}"
  			echo -ne "checking md5sum (${count_current}/${count_total}): "
- 			( cd ${PKGDIR}; md5sum -c ${md5file}) || die "md5 for ${pkgfile} failed"
+ 			mchecksum --rundir "${PKGDIR}" --file "${md5file}" --method md5 || die "md5 for ${pkgfile} failed"
  		else
  			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
  			echo -e "!! no md5sum file found for ${pkgfile} :("
-Line 2999 
 pkgsearch()
+Line 3043 
 pkgsearch()
  	local state
  	local descriptiom
  	local homepage
+ 	local license
  	local i
  	local all_installed
  	local ipver
-Line 3035 
 pkgsearch()
+Line 3080 
 pkgsearch()
  			state="$(get_value_from_magefile STATE ${magefile})"
  			description="$(get_value_from_magefile DESCRIPTION ${magefile})"
  			homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
+ 			license="$(get_value_from_magefile LICENSE ${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}"
-Line 3050 
 pkgsearch()
+Line 3096 
 pkgsearch()
  				fi
  			done
  			[[ -z ${all_installed} ]] && all_installed="none"
  			case ${state} in
  				stable) state=${COLGREEN}"[s] ";;
  				testing) state=${COLYELLOW}"[t] ";;
-Line 3074 
 pkgsearch()
+Line 3120 
 pkgsearch()
  				"") continue;;
  			esac
- 			deps="${deps} $(basename ${dep%-*})"
+ 			if [[ -z ${deps} ]]
+ 			then
+ 				deps="$(basename ${dep%-*})"
+ 			else
+ 				deps="${deps} $(basename ${dep%-*})"
+ 			fi
  		done << EOF
  ${depsfull}
  EOF
-Line 3085 
 EOF
+Line 3136 
 EOF
  				"") continue;;
  			esac
- 			sdeps="${sdeps} $(basename ${dep%-*})"
+ 			if [[ -z ${sdeps} ]]
+ 			then
+ 				sdeps="$(basename ${dep%-*})"
+ 			else
+ 				sdeps="${sdeps} $(basename ${dep%-*})"
+ 			fi
  		done << EOF
  ${sdepsfull}
  EOF
-Line 3095 
 EOF
+Line 3151 
 EOF
  		echo "      Installed versions: ${all_installed}"
  		echo "      Description: ${description}"
  		echo "      Homepage: ${homepage}"
- 		echo "      Depends: ${deps}"
+ 		if [[ ! -z ${license} ]]
+ 		then
+ 			echo "      License:  ${license}"
+ 		fi
+ 		echo "      Depends:  ${deps}"
  		echo "      SDepends: ${sdeps}"
  		echo
-Line 3212 
 EOF
+Line 3272 
 EOF
  need_busybox_support()
  {
  	local cmd
+ 	local busybox
  	cmd="$1"
- 	if [[ -x /bin/busybox ]]
+ 	for busybox in {,/usr}/bin/busybox
- 	then
+ 	do
- 		if [[ $(readlink $(which ${cmd})) = /bin/busybox ]]
+ 		if [[ -x ${busybox} ]]
  		then
- 			# needs busybox support
+ 			if [[ $(readlink $(which ${cmd})) = ${busybox} ]]
- 			return 0
+ 			then
+ 				# needs busybox support
+ 				return 0
+ 			fi
  		fi
- 	fi
+ 	done
  	# no busybox
  	return 1
-Line 3285 
 known_mage_feature()
+Line 3349 
 known_mage_feature()
  		ccache|!ccache) retval=0 ;;
  		check|!check) retval=0 ;;
  		compressdoc|!compressdoc) retval=0 ;;
+ 		debug|!debug) retval=0 ;;
  		distcc|!distcc) retval=0 ;;
  		kernelsrcunpack|!kernelsrcunpack) retval=0 ;;
  		libtool|!libtool) retval=0 ;;
  		linuxsymlink|!linuxsymlink) retval=0 ;;
  		pkgbuild|!pkgbuild) retval=0 ;;
+ 		pkgdistrotag|!pkgdistrotag) retval=0 ;;
  		purge|!purge) retval=0 ;;
  		qalint|!qalint) retval=0 ;;
  		regentree|!regentree) retval=0 ;;
- 		stepbystep|!stepbystep) retval=0 ;;
+ 		resume|!resume) retval=0 ;;
  		srcpkgbuild|!srcpkgbuild) retval=0 ;;
  		srcpkgtarball|!srcpkgtarball) retval=0 ;;
+ 		static|!static) retval=0 ;;
+ 		stepbystep|!stepbystep) retval=0 ;;
  		strip|!strip) retval=0 ;;
+ 		verbose|!verbose) retval=0 ;;
  		*) retval=1 ;;
  	esac
-Line 3305 
 known_mage_feature()
+Line 3374 
 known_mage_feature()
  load_mage_features()
  {
- 	echo -en "${COLBLUE}---${COLGREEN} Loading mage-features... ${COLDEFAULT}"
  	for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}
  	do
  		FVERBOSE=off msetfeature ${i}
  	done
- 	echo -e "${COLGREEN}done${COLDEFAULT}"
  }
  msetfeature()
-Line 3328 
 msetfeature()
+Line 3394 
 msetfeature()
  		if ! known_mage_feature "${feature}"
  		then
- 			[[ ${FVERBOSE} = off ]] || echo "unkown feature ${feature}, ignoring it"
+ 			[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
  			return 3
  		fi
-Line 3381 
 mqueryfeature()
+Line 3447 
 mqueryfeature()
  			fi
  		done
  	else
+ 		[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
  		retval=3
  	fi
-Line 3389 
 mqueryfeature()
+Line 3456 
 mqueryfeature()
  mprintfeatures()
  {
- 	echo "Global features:  ${MAGE_FEATURES_GLOBAL[*]}"
+ 	echo -e "${COLRED}Global features:${COLDEFAULT} ${MAGE_FEATURES_GLOBAL[*]}"
- 	echo "Local features:   ${MAGE_FEATURES[*]}"
+ 	echo -e "${COLYELLOW}Local features:${COLDEFAULT} ${MAGE_FEATURES[*]}"
- 	echo "Current features: ${MAGE_FEATURES_CURRENT[*]}"
+ 	echo -e "${COLGREEN}Current features:${COLDEFAULT} ${MAGE_FEATURES_CURRENT[*]}"
  }

 Legend:



Removed from v.1599
 


changed lines


 
Added in v.1963
 Legend:



Removed from v.1599
 


changed lines


 
Added in v.1963
-Removed from v.1599
+Added in v.1963