--- trunk/mage/usr/lib/mage/mage4.functions.sh	2006/04/27 17:15:23	373
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2007/03/28 20:26:08	451
@@ -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.19 2006-04-27 17:15:23 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh,v 1.30 2007-03-28 20:26:08 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
@@ -1253,7 +1240,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
@@ -1388,7 +1375,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=' '
@@ -1398,7 +1385,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
@@ -1407,7 +1394,7 @@
 			for x in ${CONFIG_PROTECT_MASK}
 			do
 				TEST="${EXPFILE/#${MROOT}${x}/Protect_Masked}"
-				if [ "${TEST}" != "${EXPFILE}" ]
+				if [[ ${TEST} != ${EXPFILE} ]]
 				then
 					PROTECTED=MASKED
 				fi
@@ -1460,6 +1447,7 @@
 	local list
 	local pcatdir
 	local protected
+	local i
 
 	# very basic getops
 	for i in $*
@@ -1721,9 +1709,9 @@
 {
 	local i
 
-	if [ -n "$@" ]
+	if [[ -n $* ]]
 	then
-		for i in $@
+		for i in $*
 		do
 			[[ ${MAGEDEBUG} = on ]] && \
 				echo "--- Including ${MAGEDIR}/include/${i}.minc"
@@ -1737,9 +1725,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
@@ -2170,6 +2158,7 @@
 		smage2file=${SMAGESCRIPTSDIR}/${pname}/${pname}-${pver}-${pbuild}.smage2
 		if [ -f "${smage2file}" ]
 		then
+			echo -e " ${COLBLUE}***${COLDEFAULT} building package from source ... "
 			smage2 ${smage2file} || die "compile failed"
 		else
 			echo
@@ -2183,14 +2172,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
 
@@ -2447,7 +2429,7 @@
 	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"
 	source ${magefile}
@@ -2547,9 +2529,10 @@
 	local all_installed
 	local ipver
 	local ipbuild
+	local latest_available
 
 	# 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
@@ -2564,37 +2547,46 @@
 		# 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})"
-
-		# 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"
+		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
 
-		case ${state} in
-			stable) state=${COLGREEN}"[s] ";;
-			testing) state=${COLYELLOW}"[t] ";;
-			unstable) state=${COLRED}"[u] ";;
-			old) state=${COLGRAY}"[o] ";;
-		esac
+			latest_available="${pver}-${pbuild}"
+		else
+			# package is masked
+			state="${COLRED}[m] "
+			latest_available="${COLRED}masked for this distribution.${COLDEFAULT}"
+		fi
 
 		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}"