--- trunk/mage/usr/lib/mage/mage4.functions.sh	2006/02/16 22:11:06	329
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2008/10/05 10:32:24	776
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Magellan Linux Installer Functions (mage.functions.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.16 2006-02-16 22:11:06 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.38 2008-10-05 10:32:24 niro Exp $
 
 mage_setup()
 {
@@ -1106,7 +1106,7 @@
 	local count_current
 	local count_total
 
-	[ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your /etc/mage.rc."
+	[ -z "${MIRRORS}" ] && die "You have no mirrors defined. Please edit your ${MAGERC}."
 
 	# get count of total packages
 	declare -i count_current=0
@@ -1181,26 +1181,13 @@
 {
 	if [ -z "${RSYNC}" ]
 	then
-		die "You have no rsync-mirrors defined. Please edit your /etc/mage.rc."
+		die "You have no rsync-mirrors defined. Please edit your ${MAGERC}."
 	fi
 
 	local i
 	for i in ${RSYNC}
 	do
-		rsync \
-			--recursive \
-			--links \
-			--perms \
-			--times \
-			--devices \
-			--timeout=600 \
-			--verbose \
-			--compress \
-			--progress \
-			--stats \
-			--delete \
-			--delete-after \
-			${i} ${MAGEDIR}
+		rsync ${RSYNC_FETCH_OPTIONS} ${i} ${MAGEDIR}
 		if [[ $? = 0 ]]
 		then
 			break
@@ -1216,6 +1203,63 @@
 	is_newer_mage_version_available
 }
 
+syncmage_tarball()
+{
+	local latest_tarball
+	local temp="$(mktemp -d)"
+	local mirr mymirr
+
+	# try to get the tarball marked as latest on the server
+	latest_tarball="mage-latest.tar.bz2"
+
+	for mirr in ${MIRRORS}
+	do
+		# path without distribution
+		mymirr="${mirr%/*}"
+
+		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+		echo "fetching latest tarball from ${mymirr} ..."
+
+		wget \
+			--passive-ftp \
+			--tries 3 \
+			--continue \
+			--progress bar \
+			--directory-prefix=${temp} \
+			${mymirr}/rsync/tarballs/${latest_tarball}
+		if [[ $? = 0 ]]
+		then
+			break
+		else
+			continue
+		fi
+	done
+
+	if [[ -f ${temp}/${latest_tarball} ]]
+	then
+		if [[ -d ${MAGEDIR} ]]
+		then
+			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+			echo "cleaning old mage-tree ${MAGEDIR}..."
+			rm -rf ${MAGEDIR}
+		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"
+
+		if [[ -d ${temp} ]]
+		then
+			echo -ne "${COLBLUE} --- ${COLDEFAULT}"
+			echo "clenaing temp-files ..."
+			rm -rf ${temp}
+		fi
+	else
+		die "Could not fetch the latest tarball ... aborting"
+	fi
+}
+
 cleanpkg()
 {
 	if [ -d "${PKGDIR}" ]
@@ -1253,7 +1297,7 @@
 	if [ -n "$(echo ${MAGENAME}|fgrep .mage)" ]
 	then
 		#cuts ARCH and PBUILD
-		#ARCH comes from /etc/mage.rc
+		#ARCH comes from ${MAGERC}
 		MAGENAME=$(echo ${MAGENAME} |sed -e "s:-${ARCH}-r*.::g")
 
 		#cuts version number
@@ -1286,6 +1330,9 @@
 # returns 0=stable 1=unstable
 check_stable_package()
 {
+	# first check if this magefile is not blacklisted
+	blacklisted "$1" || return 1
+
 	local STATE
 	STATE="$(get_value_from_magefile STATE "$1")"
 
@@ -1325,10 +1372,12 @@
 	local PNAME="$2"
 	local magefile
 
-	for magefile in $(ls --format=single-column -v ${MAGEDIR}/${PCAT}/${PNAME}/*)
+	# do not list the content of a directory, only the name (-d)
+	for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/*)
 	do
+		[[ -z ${magefile} ]] && continue
 		# we exclude subdirs (for stuff like a md5sum dir)
-		[ -d ${magefile} ] && continue
+		[[ -d ${magefile} ]] && continue
 		if check_stable_package ${magefile}
 		then
 			HIGHEST_MAGEFILE=${magefile}
@@ -1337,26 +1386,27 @@
 		fi
 	done
 
-	# stop here if HIGHEST_MAGEFILE is zero
-	# this package must be unstable or old
-	if [ -z "${HIGHEST_MAGEFILE}" ]
-	then
-		echo
-		echo -n "All packages named "
-		echo -en ${COLRED}\""${PKGNAME%-*-*-*}\""${COLDEFAULT}
-		echo -n " are marked "
-		echo -en ${COLRED}"*UNSTABLE*"${COLDEFAULT}
-		echo "."
-		echo "You need to declare USE_UNSTABLE=true to install this."
-		echo 
-		echo "Example:"
-		echo "         USE_UNSTABLE=true mage install ${PKGNAME%-*-*-*}"
-		echo
-		echo "Be warned that these packages are not stable and may cause serious problems."
-		echo "You should know what you are doing, so don't complain about any damage."
-		echo
-		return 1
-	fi
+# do not so anything
+# 	# stop here if HIGHEST_MAGEFILE is zero
+# 	# this package must be unstable or old
+# 	if [ -z "${HIGHEST_MAGEFILE}" ]
+# 	then
+# 		echo
+# 		echo -n "All packages named "
+# 		echo -en ${COLRED}\""${PKGNAME%-*-*-*}\""${COLDEFAULT}
+# 		echo -n " are marked "
+# 		echo -en ${COLRED}"*UNSTABLE*"${COLDEFAULT}
+# 		echo "."
+# 		echo "You need to declare USE_UNSTABLE=true to install this."
+# 		echo 
+# 		echo "Example:"
+# 		echo "         USE_UNSTABLE=true mage install ${PKGNAME%-*-*-*}"
+# 		echo
+# 		echo "Be warned that these packages are not stable and may cause serious problems."
+# 		echo "You should know what you are doing, so don't complain about any damage."
+# 		echo
+# 		return 1
+# 	fi
 
 	echo "${HIGHEST_MAGEFILE}"
 	return 0
@@ -1384,7 +1434,7 @@
 	EXPFILE="${MROOT}$1"
 
 	# file does not exist; it can be written
-	[ ! -e ${EXPFILE} ] && return 0
+	[[ ! -e ${EXPFILE} ]] && return 0
 
 	# to be safe; it may be '§'
 	IFS=' '
@@ -1394,7 +1444,7 @@
 	do
 		# ersetzen von $i nur wenn am anfang der variable
 		TEST="${EXPFILE/#${MROOT}${i}/Protected}"
-		if [ "${TEST}" != "${EXPFILE}" ]
+		if [[ ${TEST} != ${EXPFILE} ]]
 		then
 			# setzen das es protected ist
 			PROTECTED=TRUE
@@ -1403,7 +1453,7 @@
 			for x in ${CONFIG_PROTECT_MASK}
 			do
 				TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"
-				if [ "${TEST}" != "${EXPFILE}" ]
+				if [[ ${TEST} != ${EXPFILE} ]]
 				then
 					PROTECTED=MASKED
 				fi
@@ -1439,7 +1489,29 @@
 ###################################################
 count_protected_files()
 {
-	${MLIBDIR}/writeprotected "$1"
+	local file="$1"
+	local dirname="${file%/*}"
+	local filename="${file##*/}"
+	local count
+	local output
+	local i
+
+	declare -i count=0
+
+	# check if there are already protected files
+	for oldpretected 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::")
+	done
+	(( count ++ ))
+
+	# fill output up with zeros
+	for (( i=${#count}; i < 4; i++ )); do output="${output}0"; done
+	output="${output}${count}"
+
+	echo "${output}"
 }
 
 # call with
@@ -1456,6 +1528,7 @@
 	local list
 	local pcatdir
 	local protected
+	local i
 
 	# very basic getops
 	for i in $*
@@ -1717,9 +1790,9 @@
 {
 	local i
 
-	if [ -n "$@" ]
+	if [[ -n $* ]]
 	then
-		for i in $@
+		for i in $*
 		do
 			[[ ${MAGEDEBUG} = on ]] && \
 				echo "--- Including ${MAGEDIR}/include/${i}.minc"
@@ -1733,9 +1806,9 @@
 {
 	local i
 
-	if [ -n "$@" ]
+	if [[ -n $* ]]
 	then
-		for i in $@
+		for i in $*
 		do
 			echo "--- Including ${SMAGESCRIPTSDIR}/include/${i}.sminc"
 			source ${SMAGESCRIPTSDIR}/include/${i}.sminc
@@ -1759,7 +1832,7 @@
 		echo -en ${COLRED}"An update for your packetmanager is available. "${COLDEFAULT}
 		echo -e ${COLBLUE}"[ ${newest_mage} ]"${COLDEFAULT}
 		echo "It is recommened to install this newer version"
-		echo "or your current system installation may brake."
+		echo "or your current system installation may break."
 		echo
 		echo -en "Please update mage by running "
 		echo -e ${COLGREEN}"'mage install mage'"${COLDEFAULT}
@@ -2031,6 +2104,9 @@
 	local magefile="$2"
 	local value
 
+	[[ -z ${var} ]] && return 1
+	[[ -z ${magefile} ]] && return 1
+
 	# local all possible vars of a mage file
 	# to prevent bad issues
 	local PKGNAME
@@ -2160,9 +2236,15 @@
 			echo B:${pbuild}
 		fi
 
-		smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+		if [[ -z ${MAGE_TARGETS} ]]
+		then
+			smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
+		else
+			smage2file=${SMAGESCRIPTSDIR}/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+		fi
 		if [ -f "${smage2file}" ]
 		then
+			echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
 			smage2 ${smage2file} || die "compile failed"
 		else
 			echo
@@ -2176,14 +2258,7 @@
 	if [[ ${PKGTYPE} != virtual ]] && \
 		[[ ${PKGTYPE} != sources ]]
 	then
-		# show a verbose message on src-install
-		if [[ ${src_install} = true ]]
-		then
-			echo -ne "${COLBLUE} *** ${COLDEFAULT}"
-			echo -ne "merging files: "
-			echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
-			echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"
-		fi
+		echo -e " ${COLBLUE}***${COLDEFAULT} merging files into system ... "
 		build_doinstall ${PKGNAME}
 	fi
 
@@ -2440,9 +2515,9 @@
 	echo -ne "${COLBLUE} <<< ${COLDEFAULT}"
 	echo -n "removing: "
 	echo -ne "${COLBLUE}${pcat}/${COLDEFAULT}"
-	echo -e "${COLGREEN}${pname}-${pver}-${pbuild}${COLDEFAULT}"
+	echo -e "${COLRED}${pname}-${pver}-${pbuild}${COLDEFAULT}"
 
-	magefile="${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
+	magefile="${MROOT}${INSTALLDB}/${pcat}/${pname}-${pver}-${pbuild}/${pname}-${pver}-${pbuild}.mage"
 	source ${magefile}
 
 	## preremove scripts
@@ -2540,9 +2615,16 @@
 	local all_installed
 	local ipver
 	local ipbuild
+	local latest_available
+	local depsfull
+	local sdepsfull
+	local deps
+	local sdeps
+	local dep
+	local sign
 
 	# only names no versions
-	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*')"
+	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*'| sed '/profiles/d' | sed '/includes/d')"
 	#result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"
 
 	# nothing found
@@ -2557,40 +2639,76 @@
 		# get highest version available
 		magefile=$(get_highest_magefile ${pcat} ${pname})
 
-		# now get all needed infos to print a nice output
-		pver="$(magename2pver ${magefile})"
-		pbuild="$(magename2pbuild ${magefile})"
-		state="$(get_value_from_magefile STATE ${magefile})"
-		description="$(get_value_from_magefile DESCRIPTION ${magefile})"
-		homepage="$(get_value_from_magefile HOMEPAGE ${magefile})"
+		if [[ ! -z ${magefile} ]]
+		then
+			# now get all needed infos to print a nice output
+			pver="$(magename2pver ${magefile})"
+			pbuild="$(magename2pbuild ${magefile})"
+			state="$(get_value_from_magefile STATE ${magefile})"
+			description="$(get_value_from_magefile DESCRIPTION ${magefile})"
+			homepage="$(get_value_from_magefile HOMEPAGE ${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}"
+				else
+					all_installed="${all_installed} ${ipver}-${ipbuild}"
+				fi
+			done
+			[[ -z ${all_installed} ]] && all_installed="none"
+	
+			case ${state} in
+				stable) state=${COLGREEN}"[s] ";;
+				testing) state=${COLYELLOW}"[t] ";;
+				unstable) state=${COLRED}"[u] ";;
+				old) state=${COLGRAY}"[o] ";;
+			esac
 
-		# all installed
-		for i in $(get_uninstall_candidates --pname ${pname} --pcat ${pcat})
-		do
-			ipver="$(magename2pver ${i})"
-			ipbuild="$(magename2pbuild ${i})"
+			latest_available="${pver}-${pbuild}"
+		else
+			# package is masked
+			state="${COLRED}[m] "
+			latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"
+		fi
 
-			if [[ -z ${all_installed} ]]
-			then
-				all_installed="${ipver}-${ipbuild}"
-			else
-				all_installed="${all_installed} ${ipver}-${ipbuild}"
-			fi
-		done
-		[[ -z ${all_installed} ]] && all_installed="none"
+		depsfull="$(get_value_from_magefile DEPEND ${magefile})"
+		sdepsfull="$(get_value_from_magefile SDEPEND ${magefile})"
 
-		case ${state} in
-			stable) state=${COLGREEN}"[s] ";;
-			testing) state=${COLYELLOW}"[t] ";;
-			unstable) state=${COLRED}"[u] ";;
-			old) state=${COLGRAY}"[o] ";;
-		esac
+		while read sign dep
+		do
+			case ${dep} in
+				"") continue;;
+			esac
+
+			deps="${deps} $(basename ${dep%-*})"
+		done << EOF
+${depsfull}
+EOF
+
+		while read sign dep
+		do
+			case ${dep} in
+				"") continue;;
+			esac
+
+			sdeps="${sdeps} $(basename ${dep%-*})"
+		done << EOF
+${sdepsfull}
+EOF
 
 		echo -e "${state}${pcat}/${pname}"${COLDEFAULT}
-		echo "      Latest available:   ${pver}-${pbuild}"
+		echo -e "      Latest available:   ${latest_available}"
 		echo "      Installed versions: ${all_installed}"
 		echo "      Description: ${description}"
 		echo "      Homepage: ${homepage}"
+		echo "      Depends: ${deps}"
+		echo "      SDepends: ${sdeps}"
 		echo
 
 		unset pcat
@@ -2604,6 +2722,12 @@
 		unset all_installed
 		unset ipver
 		unset ipbuild
+		unset depsfull
+		unset sdepsfull
+		unset deps
+		unset sdeps
+		unset dep
+		unset sign
 	done
 }
 
@@ -2628,3 +2752,64 @@
 		shift
 	done
 }
+
+mlibdir()
+{
+	local libdir=lib
+	[[ ${ARCH} = x86_64 ]] && libdir=lib64
+
+	echo "${libdir}"
+}
+
+## blacklisted ${magefile}
+blacklisted()
+{
+	[[ -z ${MAGE_DISTRIBUTION} ]] && local MAGE_DISTRIBUTION=stable
+
+	# compat
+	[[ ${USE_UNSTABLE} = true ]] && local MAGE_DISTRIBUTION=unstable
+	[[ ${USE_TESTING} = true ]] && local MAGE_DISTRIBUTION=testing
+
+	local EXCLUDED="/etc/mage-profile/package.blacklist-${ARCH}-${MAGE_DISTRIBUTION}"
+
+	# return 0 if the list not exist; nothin is masked
+	[[ ! -f ${EXCLUDED} ]] && return 0
+
+	local MAGEFILE="$1"
+
+	local PCAT="$(magename2pcat ${MAGEFILE})"
+	local PNAME="$(magename2pname ${MAGEFILE})"
+	local PVER="$(magename2pver ${MAGEFILE})"
+	local PBUILD="$(magename2pbuild ${MAGEFILE})"
+
+	local EXPCAT EXPNAME EXPVER EXPBUILD
+	while read EXPCAT EXPNAME EXPVER EXPBUILD
+	do
+		# ignore spaces and comments
+        	case "${EXPCAT}" in
+                	\#*|"") continue ;;
+        	esac
+
+		# exclude full pver
+		if [[ -n ${PCAT} ]] && [[ -n ${PNAME} ]] &&
+			[[ -n ${EXPCAT} ]] && [[ -n ${EXPNAME} ]] &&
+			[[ -n ${PVER} ]] && [[ -n ${PBUILD} ]] &&
+			[[ -n ${EXPVER} ]] && [[ -n ${EXPBUILD} ]]
+		then
+			[[ ${EXPCAT}/${EXPNAME}-${EXPVER}-${EXPBUILD} = ${PCAT}/${PNAME}-${PVER}-${PBUILD} ]] && return 1
+		fi
+
+		# exclude pcat/pname only
+		if [[ -n ${PCAT} ]] && [[ -n ${PNAME} ]] &&
+			[[ -n ${EXPCAT} ]] && [[ -n ${EXPNAME} ]] &&
+			[[ -z ${EXPVER} ]] && [[ -z ${EXPBUILD} ]]
+		then
+			[[ ${EXPCAT}/${EXPNAME} = ${PCAT}/${PNAME} ]] && return 1
+		fi
+	done << EOF
+$( cat ${EXCLUDED}; echo)
+EOF
+
+	return 0
+}
+