/[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 1599 by niro,
Fri Dec 30 10:07:18 2011 UTC
+revision 1654 by niro,
Fri Jan 13 23:20:39 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 82 
 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 1401 
 mdownload()
+Line 1420 
 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 1579 
 syncmage_tarball()
+Line 1598 
 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 | xarg --no-run-if-empty rm -r
+ 				fi
+ 			else
+ 				rm -rf ${MAGEDIR}
+ 			fi
  		fi
  		if need_busybox_support tar
-Line 1645 
 xtitleclean()
+Line 1673 
 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 2759 
 md5sum_packages()
+Line 2790 
 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 3030 
 pkgsearch()
  	local state
  	local descriptiom
  	local homepage
+ 	local license
  	local i
  	local all_installed
  	local ipver
-Line 3035 
 pkgsearch()
+Line 3067 
 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 3083 
 pkgsearch()
  				fi
  			done
  			[[ -z ${all_installed} ]] && all_installed="none"
  			case ${state} in
  				stable) state=${COLGREEN}"[s] ";;
  				testing) state=${COLYELLOW}"[t] ";;
-Line 3095 
 EOF
+Line 3128 
 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 3285 
 known_mage_feature()
+Line 3322 
 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 3347 
 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 3367 
 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 3420 
 mqueryfeature()
  			fi
  		done
  	else
+ 		[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
  		retval=3
  	fi

 Legend:



Removed from v.1599
 


changed lines


 
Added in v.1654
 Legend:



Removed from v.1599
 


changed lines


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