/[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 1627 by niro,
Fri Jan 13 13:10:08 2012 UTC
+revision 1675 by niro,
Mon Feb  6 09:45:23 2012 UTC
 Line 72 
 mchecksum()
  	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 1545 
 syncmage_tarball()
+Line 1565 
 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 1603 
 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 1678 
 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 2795 
 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 3035 
 pkgsearch()
  	local state
  	local descriptiom
  	local homepage
+ 	local license
  	local i
  	local all_installed
  	local ipver
-Line 3035 
 pkgsearch()
+Line 3072 
 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 3088 
 pkgsearch()
  				fi
  			done
  			[[ -z ${all_installed} ]] && all_installed="none"
  			case ${state} in
  				stable) state=${COLGREEN}"[s] ";;
  				testing) state=${COLYELLOW}"[t] ";;
-Line 3095 
 EOF
+Line 3133 
 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 3291 
 known_mage_feature()
+Line 3333 
 known_mage_feature()
  		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 ;;
-Line 3329 
 msetfeature()
+Line 3372 
 msetfeature()
  		if ! known_mage_feature "${feature}"
  		then
- 			[[ ${FVERBOSE} = off ]] || echo "unknown feature ${feature}, ignoring it"
+ 			[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
  			return 3
  		fi
-Line 3382 
 mqueryfeature()
+Line 3425 
 mqueryfeature()
  			fi
  		done
  	else
+ 		[[ ${FVERBOSE} = off ]] || echo -e "${COLRED}Unknown feature '${feature}', ignoring it${COLDEFAULT}"
  		retval=3
  	fi

 Legend:



Removed from v.1627
 


changed lines


 
Added in v.1675
 Legend:



Removed from v.1627
 


changed lines


 
Added in v.1675
-Removed from v.1627
+Added in v.1675