--- trunk/mage/usr/lib/mage/mage4.functions.sh	2005/10/21 14:50:13	273
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2006/02/16 22:11:06	329
@@ -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.8 2005-10-21 14:50:13 niro Exp $
+# $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 $
 
 mage_setup()
 {
@@ -361,6 +361,8 @@
 	local pkgname="$1"
 	local pathto
 	local posix
+	local major
+	local minor
 	local IFS
 
 	# sanity checks; abort if not given
@@ -374,12 +376,12 @@
 	# sets fieldseperator to "§" instead of " "
 	IFS=§
 
-	while read pathto posix
+	while read pathto posix major minor
 	do
 		[ -z "${pathto}" ] && continue
 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> CHAR: ${MROOT}${pathto}"
 
-		mknode -m ${posix} -c "${MROOT}${pathto}"
+		mknod -m ${posix} "${MROOT}${pathto}" c ${major} ${minor}
 	done < ${BUILDDIR}/${pkgname}/.char
 
 	# very important: unsetting the '§' fieldseperator
@@ -556,14 +558,18 @@
 	# abort if mage file not exists
 	[ ! -f ${magefile} ] && die "remove_database_entry() ${magefile} not exist."
 
-	# first unregister virtuals
-	provide="$(get_value_from_magefile PROVIDE ${magefile})"
-	if [ -n "${provide}" ]
+	# remove virtuals only if no other exist
+	if [[ $(count_installed_pkgs --pcat ${pcat} --pname ${pname}) -le 1 ]]
 	then
-		for i in ${provide}
-		do
-			virtuals_del "${i}" "${pcat}/${pname}"
-		done
+		# first unregister virtuals
+		provide="$(get_value_from_magefile PROVIDE ${magefile})"
+		if [ -n "${provide}" ]
+		then
+			for i in ${provide}
+			do
+				virtuals_del "${i}" "${pcat}/${pname}"
+			done
+		fi
 	fi
 
 	# removes database entry
@@ -573,6 +579,39 @@
 	fi
 }
 
+# get the number of installed packages
+count_installed_pkgs()
+{
+	local pcat
+	local pname
+	local pkg
+	local i
+
+	# very basic getops
+	for i in $*
+	do
+		case $1 in
+			--pcat|-c) shift; pcat="$1" ;;
+			--pname|-n) shift; pname="$1" ;;
+		esac
+		shift
+	done
+
+	# sanity checks; abort if not given
+	[ -z "${pcat}" ] && die "pkg_count() \$pcat not given."
+	[ -z "${pname}" ] && die "pkg_count() \$pname not given."
+
+	declare -i i=0
+	for pkg in $(get_uninstall_candidates --pcat ${pcat} --pname ${pname})
+	do
+		(( i++ ))
+		#echo "$i ${pkg}"
+	done
+
+	# return the value
+	echo "${i}"
+}
+
 
 ###################################################
 # function compare_mtime                          #
@@ -765,10 +804,35 @@
 		# 1=keep me   #
 		case ${retval} in
 			0)
-				[[ ${VERBOSE} = on ]] && echo -e "\t<<< FILE: ${MROOT}${pathto}"
-				rm "${MROOT}${pathto}"
-				;;
+				# check if the file is config_protected
+				# ${MROOT} will automatically added if set !!
+				is_config_protected "${pathto}"
+				retval="$?"
+		
+				# 0 - not protected        #
+				# 1 - error                #
+				# 2 - protected            #
+				# 3 - protected but masked #
+		
+				case ${retval} in
+					# file is not protected - delete it
+					0|3)
+						[[ ${VERBOSE} = on ]] && echo -e "\t<<< FILE: ${MROOT}${pathto}"
+						rm "${MROOT}${pathto}"
+						;;
 
+					# file is protected, do not delete
+					2)
+						if [[ ${VERBOSE} = on ]]
+						then
+							echo -en "${COLRED}"
+							echo -n "! prot "
+							echo -en "${COLDEFAULT}"
+							echo " === FILE: ${MROOT}${pathto}"
+						fi
+						;;
+				esac
+				;;
 			1)
 				[[ ${VERBOSE} = on ]] && \
 					echo -e "${COLRED}! mtime${COLDEFAULT} === FILE: ${MROOT}${pathto}"
@@ -1094,7 +1158,7 @@
 				--continue \
 				--progress bar \
 				--directory-prefix=${PKGDIR} \
-				${opt} ${mirr}/packages/${pkg}
+				${opt} ${mirr}/${PACKAGES_SERVER_PATH}/${pkg}
 			if [[ $? = 0 ]]
 			then
 				break
@@ -1226,7 +1290,7 @@
 	STATE="$(get_value_from_magefile STATE "$1")"
 
 	# state testing
-	if [[ ${USE_TESTING} = true ]]
+	if [[ ${USE_TESTING} = true ]] || [[ ${MAGE_DISTRIBUTION} = testing ]]
 	then
 		case ${STATE} in
 			testing|stable) return 0 ;;
@@ -1235,7 +1299,7 @@
 	fi
 
 	# state unstable
-	if [[ ${USE_UNSTABLE} = true ]]
+	if [[ ${USE_UNSTABLE} = true ]] || [[ ${MAGE_DISTRIBUTION} = unstable ]]
 	then
 		case ${STATE} in
 			unstable|testing|stable) return 0 ;;
@@ -1404,15 +1468,16 @@
 		shift
 	done
 
-	# sanity checks; abort if not given
-	[ -z "${search_pname}" ] && die "get_uninstall_candidates() \$search_pname not given."
+# it's not good to complain here about empty pnames; better to continue later anyway
+#	# sanity checks; abort if not given
+#	[ -z "${search_pname}" ] && die "get_uninstall_candidates() \$search_pname not given."
 
 
 	# check needed global vars
 	[ -z "${INSTALLDB}" ] && die "get_uninstall_candidates() \$INSTALLDB not set."
 
 	# set pcatdir to '*' if empty
-	[ -z "${pcatdir}" ] && pcatdir=*
+	[ -z "${pcatdir}" ] && pcatdir='*'
 
 	for pkg in ${MROOT}${INSTALLDB}/${pcatdir}/*
 	do
@@ -1501,7 +1566,7 @@
 
 	if virtuals_read ${virtualname}
 	then
-		# make shure ${PKG_NAME} is *not* in ${VIRTUAL_NAME} already
+		# make sure ${PKG_NAME} is *not* in ${VIRTUAL_NAME} already
 		for i in $(virtuals_read ${virtualname} showpkgs)
 		do
 			if [[ ${i} = ${pkgname} ]]
@@ -2477,8 +2542,8 @@
 	local ipbuild
 
 	# only names no versions
-	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name *${string}*)"
-	#result="$(find ${MAGEDIR} -type f -name *${string}*.mage | sort)"
+	result="$(find ${MAGEDIR} -mindepth 2 -maxdepth 2 -type d -name '*'${string}'*')"
+	#result="$(find ${MAGEDIR} -type f -name '*'${string}'*'.mage | sort)"
 
 	# nothing found
 	[[ -z ${result} ]] && die "No package found containing '${string}' in the name."