/[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 1549 by niro,
Tue Dec 27 10:43:40 2011 UTC
+revision 1648 by niro,
Fri Jan 13 20:51:18 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} ]]
 Line 206 
 install_directories()
  	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> DIR:  ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t>>> DIR:  ${MROOT}${pathto}"
  		# monitors /etc/env.d -> env-rebuild
  		[[ ${pathto} = /etc/env.d ]] && export MAGE_ENV_REBUILD=true
 Line 282 
 install_files()
  		case ${retval} in
  			# file is not protected - (over)write it
 |3)
- 				[[ ${VERBOSE} = on ]] && echo -e "\t>>> FILE: ${MROOT}${pathto}"
+ 				mqueryfeature "verbose" && echo -e "\t>>> FILE: ${MROOT}${pathto}"
  				install -m "${posix}" -o "${user}" -g "${group}" \
  					${BUILDDIR}/${pkgname}/binfiles/"${pathto}" \
  					"${MROOT}${pathto}"
 Line 300 
 install_files()
  			# file is protected, write backup file
 )
- 				if [[ ${VERBOSE} = on ]]
+ 				if mqueryfeature "verbose"
  				then
  					echo -en "${COLRED}"
  					echo -n "! prot "
 Line 331 
 install_files()
  			# file is protected but ignored, delete the update/do nothing
 )
- 				if [[ ${VERBOSE} = on ]]
+ 				if mqueryfeature "verbose"
  				then
  					echo -en "${COLRED}"
  					echo -n "! ignr "
 Line 390 
 install_symlinks()
  	while read pathto posix link mtime
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> LINK: ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t>>> LINK: ${MROOT}${pathto}"
  		ln -snf "${link}" "${MROOT}${pathto}"
 Line 440 
 install_blockdevices()
  	while read pathto posix major minor user group
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> PIPE: ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t>>> PIPE: ${MROOT}${pathto}"
  		mknod -m "${posix}" "${MROOT}${pathto}"
  		# make it optional atm !!
 Line 484 
 install_characterdevices()
  	while read pathto posix major minor user group
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> CHAR: ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t>>> CHAR: ${MROOT}${pathto}"
  		mknod -m ${posix} "${MROOT}${pathto}" b "${major}" "${minor}"
 Line 528 
 install_fifos()
  	while read pathto posix user group
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> FIFO: ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t>>> FIFO: ${MROOT}${pathto}"
  		mkfifo -m "${posix}" "${MROOT}${pathto}"
  		chown "${user}:${group}" "${MROOT}${pathto}"
 Line 862 
 remove_symlinks()
  		[ -z "${pathto}" ] && continue
  		if [ ! -L "${MROOT}${pathto}" ]
  		then
- 			[[ ${VERBOSE} = on ]] && \
+ 			mqueryfeature "verbose" && \
  				echo -e "${COLRED}! exist${COLDEFAULT} === LINK: ${MROOT}${pathto}"
  			continue
  		fi
 Line 874 
 remove_symlinks()
  		# 1=keep me   #
  		case ${retval} in
 )
- 				[[ ${VERBOSE} = on ]] && echo -e "\t<<< LINK: ${MROOT}${pathto}"
+ 				mqueryfeature "verbose" && echo -e "\t<<< LINK: ${MROOT}${pathto}"
  				rm "${MROOT}${pathto}"
  				;;
 )
- 				[[ ${VERBOSE} = on ]] && \
+ 				mqueryfeature "verbose" && \
  					echo -e "${COLRED}! mtime${COLDEFAULT} === LINK: ${MROOT}${pathto}"
  				;;
  		esac
 Line 946 
 remove_files()
  		if [ ! -e "${MROOT}${pathto}" ]
  		then
- 			[[ ${VERBOSE} = on ]] && \
+ 			mqueryfeature "verbose" && \
  				echo -e "${COLRED}! exist${COLDEFAULT} === FILE: ${MROOT}${pathto}"
  			continue
  		fi
 Line 972 
 remove_files()
  				case ${retval} in
  					# file is not protected - delete it
 |3)
- 						[[ ${VERBOSE} = on ]] && echo -e "\t<<< FILE: ${MROOT}${pathto}"
+ 						mqueryfeature "verbose" && echo -e "\t<<< FILE: ${MROOT}${pathto}"
  						rm "${MROOT}${pathto}"
  						;;
  					# file is protected, do not delete
 )
- 						if [[ ${VERBOSE} = on ]]
+ 						if mqueryfeature "verbose"
  						then
  							echo -en "${COLRED}"
  							echo -n "! prot "
 Line 989 
 remove_files()
  					# file is protected but ignored, delete the update/do nothing
 )
- 						if [[ ${VERBOSE} = on ]]
+ 						if mqueryfeature "verbose"
  						then
  							echo -en "${COLRED}"
  							echo -n "! ignr "
 Line 1001 
 remove_files()
  				esac
  				;;
 )
- 				[[ ${VERBOSE} = on ]] && \
+ 				mqueryfeature "verbose" && \
  					echo -e "${COLRED}! mtime${COLDEFAULT} === FILE: ${MROOT}${pathto}"
  				;;
  		esac
 Line 1063 
 remove_blockdevices()
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t<<< PIPE: ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t<<< PIPE: ${MROOT}${pathto}"
  		rm "${MROOT}${pathto}"
  	done < ${MROOT}${INSTALLDB}/${pfull}/.pipes
 Line 1123 
 remove_characterdevices()
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t<<< CHAR: ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t<<< CHAR: ${MROOT}${pathto}"
  		rm "${MROOT}${pathto}"
  	done < ${MROOT}${INSTALLDB}/${pfull}/.char
 Line 1185 
 remove_fifos()
  	do
  		[ -z "${pathto}" ] && continue
- 		[[ ${VERBOSE} = on ]] && echo -e "\t<<< FIFO: ${MROOT}${pathto}"
+ 		mqueryfeature "verbose" && echo -e "\t<<< FIFO: ${MROOT}${pathto}"
  		rm "${MROOT}${pathto}"
  	done < ${MROOT}${INSTALLDB}/${pfull}/.fifo
 Line 1246 
 remove_directories()
  		if [ ! -d "${MROOT}${pathto}" ]
  		then
- 			[[ ${VERBOSE} = on ]] && \
+ 			mqueryfeature "verbose" && \
  				echo -e "${COLRED}! exist${COLDEFAULT} === DIR:  ${MROOT}${pathto}"
  			continue
  		fi
 Line 1254 
 remove_directories()
  		# exclude .keep directories
  		if [ -f "${MROOT}${pathto}/.keep" ]
  		then
- 			[[ ${VERBOSE} = on ]] && \
+ 			mqueryfeature "verbose" && \
  				echo -e "${COLRED}! .keep${COLDEFAULT} === DIR:  ${MROOT}${pathto}"
  			continue
  		fi
 Line 1267 
 remove_directories()
  		if rmdir "${MROOT}${pathto}" &> /dev/null
  		then
- 			[[ ${VERBOSE} = on ]] && echo -e "\t<<< DIR:  ${MROOT}${pathto}"
+ 			mqueryfeature "verbose" && echo -e "\t<<< DIR:  ${MROOT}${pathto}"
  		else
- 			[[ ${VERBOSE} = on ]] && \
+ 			mqueryfeature "verbose" && \
  				echo -e "${COLRED}! empty${COLDEFAULT} === DIR:  ${MROOT}${pathto}"
  		fi
  	done
 Line 1401 
 mdownload()
  	real_uris="$(convertmirrors ${uri})"
  	# verbose or not
- 	[[ ${VERBOSE} = off ]] && 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 1488 
 fetch_packages()
  		echo -ne " ${COLBLUE}***${COLDEFAULT}"
  		echo -e " fetching (${count_current}/${count_total}): ${pkg} ... "
  		mdownload --uri "package://${pkg}" --dir "${PKGDIR}" || die "Could not download ${pkg}"
  		if [ ! -f ${PKGDIR}/${pkg} ]
  		then
  			die "Package '${pkg}' after download not found in '${PKGDIR}'"
-Line 1551 
 syncmage_tarball()
+Line 1550 
 syncmage_tarball()
  		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
  		echo "fetching latest md5 from ${mymirr} ..."
- 		[[ ${VERBOSE} = off ]] && opt="--quiet"
+ 		mqueryfeature "!verbose" && opt="--quiet"
  		wget \
  			${wget_opts} \
  			--directory-prefix=${temp} \
-Line 1738 
 get_highest_magefile()
+Line 1737 
 get_highest_magefile()
  		then
  			HIGHEST_MAGEFILE=${magefile}
  			#for debug only
- 			[[ ${MAGEDEBUG} = on ]] && echo "HIGHEST_MAGEFILE=${HIGHEST_MAGEFILE}"
+ 			mqueryfeature "debug" && echo "HIGHEST_MAGEFILE=${HIGHEST_MAGEFILE}"
  		fi
  	done
-Line 2146 
 minclude()
+Line 2145 
 minclude()
  	then
  		for i in $*
  		do
- 			[[ ${MAGEDEBUG} = on ]] && \
+ 			mqueryfeature "debug" && \
  				echo "--- Including ${MAGEDIR}/include/${i}.minc"
  			source ${MAGEDIR}/include/${i}.minc
  		done
- 		[[ ${MAGEDEBUG} = on ]] && echo
+ 		mqueryfeature "debug" && echo
  	fi
  }
-Line 3000 
 pkgsearch()
+Line 2999 
 pkgsearch()
  	local state
  	local descriptiom
  	local homepage
+ 	local license
  	local i
  	local all_installed
  	local ipver
 Line 3036 
 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 3051 
 pkgsearch()
+Line 3052 
 pkgsearch()
  				fi
  			done
  			[[ -z ${all_installed} ]] && all_installed="none"
  			case ${state} in
  				stable) state=${COLGREEN}"[s] ";;
  				testing) state=${COLYELLOW}"[t] ";;
-Line 3096 
 EOF
+Line 3097 
 EOF
  		echo "      Installed versions: ${all_installed}"
  		echo "      Description: ${description}"
  		echo "      Homepage: ${homepage}"
+ 		if [[ ! -z ${license} ]]
+ 		then
+ 			echo "      License:  ${license}"
+ 		fi
  		echo "      Depends: ${deps}"
  		echo "      SDepends: ${sdeps}"
  		echo
-Line 3136 
 export_inherits()
+Line 3141 
 export_inherits()
  		eval "${functions}() { ${include}_${functions} ; }"
  		# debug
- 		[[ ${MAGEDEBUG} = on ]] && typeset -f "${functions}"
+ 		mqueryfeature "debug" && typeset -f "${functions}"
  		shift
  	done
-Line 3274 
 have_root_privileges()
+Line 3279 
 have_root_privileges()
  	return ${retval}
  }
+ known_mage_feature()
+ {
+ 	local feature="$1"
+ 	local retval
+ 	case "${feature}" in
+ 		autosvc|!autosvc) retval=0 ;;
+ 		buildlog|!buildlog) retval=0 ;;
+ 		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 ;;
+ 		purge|!purge) retval=0 ;;
+ 		qalint|!qalint) retval=0 ;;
+ 		regentree|!regentree) 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
+ 	return "${retval}"
+ }
+ load_mage_features()
+ {
+ 	for i in ${MAGE_FEATURES_GLOBAL[*]} ${MAGE_FEATURES[*]}
+ 	do
+ 		FVERBOSE=off msetfeature ${i}
+ 	done
+ }
+ msetfeature()
+ {
+ 	local feature
+ 	local count
+ 	local i
+ 	local found
+ 	for feature in $@
+ 	do
+ 		found=0
+ 		count="${#MAGE_FEATURES_CURRENT[*]}"
+ 		if ! known_mage_feature "${feature}"
+ 		then
+ 			[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
+ 			return 3
+ 		fi
+ 		for ((i=0; i<count; i++))
+ 		do
+ 			if [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature} ]]
+ 			then
+ 				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' already enabled${COLDEFAULT}"
+ 				MAGE_FEATURES_CURRENT[${i}]="${feature}"
+ 				found=1
+ 			elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = !${feature} ]]
+ 			then
+ 				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' currently disabled, enabling it!${COLDEFAULT}"
+ 				MAGE_FEATURES_CURRENT[${i}]="${feature}"
+ 				found=1
+ 			elif [[ ${MAGE_FEATURES_CURRENT[${i}]} = ${feature//!} ]]
+ 			then
+ 				[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature//!}' currently enabled, disabling it!${COLDEFAULT}"
+ 				MAGE_FEATURES_CURRENT[${i}]="${feature}"
+ 				found=1
+ 			fi
+ 		done
+ 		# if the feature was not found after proccessing the whole array
+ 		# it was not declared. in this case enable it
+ 		if [[ ${found} = 0 ]]
+ 		then
+ 			[[ ${FVERBOSE} = off ]] || echo -e "${COLBLUE}---${COLGREEN} Feature '${feature}' was not declared, enabling it!${COLDEFAULT}"
+ 			MAGE_FEATURES_CURRENT=( ${MAGE_FEATURES_CURRENT[*]} "${feature}" )
+ 		fi
+ 		export MAGE_FEATURE_CURRENT
+ 	done
+ }
+ mqueryfeature()
+ {
+ 	local feature="$1"
+ 	local retval=1
+ 	local i
+ 	if known_mage_feature "${feature}"
+ 	then
+ 		for i in ${MAGE_FEATURES_CURRENT[*]}
+ 		do
+ 			if [[ ${i} = ${feature} ]]
+ 			then
+ 				retval=0
+ 				break # found break here
+ 			fi
+ 		done
+ 	else
+ 		[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
+ 		retval=3
+ 	fi
+ 	return ${retval}
+ }
+ mprintfeatures()
+ {
+ 	echo "Global features:  ${MAGE_FEATURES_GLOBAL[*]}"
+ 	echo "Local features:   ${MAGE_FEATURES[*]}"
+ 	echo "Current features: ${MAGE_FEATURES_CURRENT[*]}"
+ }

 Legend:



Removed from v.1549
 


changed lines


 
Added in v.1648
 Legend:



Removed from v.1549
 


changed lines


 
Added in v.1648
-Removed from v.1549
+Added in v.1648