--- trunk/mage/usr/lib/mage/mage4.functions.sh	2011/04/27 09:45:07	1273
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2011/12/27 10:00:34	1548
@@ -2,6 +2,29 @@
 # Magellan Linux Installer Functions (mage.functions.sh)
 # $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 $
 
+COLRED="\033[1;6m\033[31m"
+COLGREEN="\033[1;6m\033[32m"
+COLYELLOW="\033[1;6m\033[33m"
+COLBLUE="\033[1;6m\033[34m"
+COLMAGENTA="\033[1;6m\033[35m"
+COLWHITE="\033[1;6m\033[37m"
+COLGRAY="\033[0;6m\033[37m"
+COLBOLD="\033[1m"
+COLDEFAULT="\033[0m"
+
+if [[ ${NOCOLORS} = true ]]
+then
+	COLRED=""
+	COLGREEN=""
+	COLYELLOW=""
+	COLBLUE=""
+	COLMAGENTA=""
+	COLWHITE=""
+	COLGRAY=""
+	COLBOLD=""
+	COLDEFAULT=""
+fi
+
 mage_setup()
 {
 	[ ! -d ${MROOT}${INSTALLDB} ] && \
@@ -141,7 +164,6 @@
 		[ -z "${pathto}" ] && continue
 		[[ ${VERBOSE} = on ]] && echo -e "\t>>> DIR:  ${MROOT}${pathto}"
 
-
 		# monitors /etc/env.d -> env-rebuild
 		[[ ${pathto} = /etc/env.d ]] && export MAGE_ENV_REBUILD=true
 
@@ -228,7 +250,7 @@
 					"${user}" \
 					"${group}" \
 					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
-						"${MROOT}${pathto}")" \
+					"${MROOT}${pathto}")" \
 					"${md5sum}"
 				;;
 
@@ -255,7 +277,7 @@
 					"${user}" \
 					"${group}" \
 					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
-						"${dest_protected}")" \
+					"${dest_protected}")" \
 					"${md5sum}"
 
 				# update global MAGE_PROTECT_COUNTER
@@ -272,7 +294,15 @@
 					echo -en "${COLDEFAULT}"
 					echo " === FILE: ${MROOT}${pathto}"
 				fi
-				# simply do nothing here
+				# simply do nothing here - only fix mtime
+				fix_descriptor ${pkgname}/.files \
+					"${pathto}" \
+					"${posix}" \
+					"${user}" \
+					"${group}" \
+					"$(fix_mtime "${BUILDDIR}/${pkgname}"/.mtime \
+					"${MROOT}${pathto}")" \
+					"${md5sum}"
 				;;
 		esac
 	done < ${BUILDDIR}/${pkgname}/.files
@@ -476,7 +506,7 @@
 
 	# sanity checks; abort if not given
 	[ -z "${pkgname}" ] && die "build_doinstall() \$pkgname not given."
-	
+
 	# this is only a wrapper
 
 	# NOTE:
@@ -1357,7 +1387,7 @@
 	done
 
 	# clean up backup files (foo~)
-	find ${MAGEDIR} -name *~ -exec rm '{}' ';'
+	find ${MAGEDIR} -name \*~ -exec rm '{}' ';'
 
 	# check if a newer mage version is available
 	is_newer_mage_version_available
@@ -1371,6 +1401,7 @@
 	local mirr mymirr
 	local opt
 	local tar_opts
+	local wget_opts
 
 	# try to get the md5 marked as latest on the server
 	latest_md5="mage-latest.md5"
@@ -1378,6 +1409,9 @@
 	# try to get the tarball marked as latest on the server
 	latest_tarball="mage-latest.tar.bz2"
 
+	# filter wget command if busybox was found
+	wget_opts="$(busybox_filter_wget_options ${WGET_FETCH_OPTIONS})"
+
 	for mirr in ${MIRRORS}
 	do
 		# path without distribution
@@ -1387,14 +1421,14 @@
 		echo "fetching latest md5 from ${mymirr} ..."
 		[[ ${VERBOSE} = off ]] && opt="--quiet"
 		wget \
-			${WGET_FETCH_OPTIONS} \
+			${wget_opts} \
 			--directory-prefix=${temp} \
 			${opt} ${mymirr}/rsync/tarballs/${latest_md5}
 
 		echo -ne "${COLBLUE} --- ${COLDEFAULT}"
 		echo "fetching latest tarball from ${mymirr} ..."
 		wget \
-			${WGET_FETCH_OPTIONS} \
+			${wget_opts} \
 			--directory-prefix=${temp} \
 			${opt} ${mymirr}/rsync/tarballs/${latest_tarball}
 		if [[ $? = 0 ]]
@@ -1480,7 +1514,7 @@
 }
 
 
-# cuts full pathnames or versioniezed names down to basename
+# cuts full pathnames or versionized names down to basename
 choppkgname()
 {
 	#we want this only if full name was used
@@ -1563,7 +1597,7 @@
 	local magefile
 
 	# do not list the content of a directory, only the name (-d)
-	for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/*)
+	for magefile in $(ls --format=single-column -v -d ${MAGEDIR}/${PCAT}/${PNAME}/* 2> /dev/null)
 	do
 		[[ -z ${magefile} ]] && continue
 		# we exclude subdirs (for stuff like a md5sum dir)
@@ -1576,28 +1610,6 @@
 		fi
 	done
 
-# 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
 }
@@ -2450,9 +2462,9 @@
 		if [[ -n ${MAGE_TARGETS} ]]
 		then
 			# basic svn compat
-			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+			if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
 			then
-				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
+				for i in ${SMAGESCRIPTSDIR}/*/${pname/${MAGE_TARGETS}/}/${pname/${MAGE_TARGETS}/}-${pver}-${pbuild}.smage2
 				do
 					smage2file="${i}"
 				done
@@ -2463,9 +2475,9 @@
 		elif [[ -n ${SPLIT_PACKAGE_BASE} ]]
 		then
 			# basic svn compat
-			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+			if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
 			then
-				for i in ${SMAGESCRIPTSDIR}/trunk/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
+				for i in ${SMAGESCRIPTSDIR}/*/${SPLIT_PACKAGE_BASE}/${SPLIT_PACKAGE_BASE}-${pver}-${pbuild}.smage2
 				do
 					smage2file="${i}"
 				done
@@ -2475,9 +2487,9 @@
 
 		else
 			# basic svn compat
-			if [[ -d ${SMAGESCRIPTSDIR}/trunk ]]
+			if [[ -d ${SMAGESCRIPTSDIR}/.svn ]]
 			then
-				for i in ${SMAGESCRIPTSDIR}/trunk/*/${pname}/${pname}-${pver}-${pbuild}.smage2
+				for i in ${SMAGESCRIPTSDIR}/*/${pname}/${pname}-${pver}-${pbuild}.smage2
 				do
 					smage2file="${i}"
 				done
@@ -3077,11 +3089,11 @@
 		then
 			# needs busybox support
 			return 0
-		else
-			# no busybox
-			return 1
 		fi
 	fi
+
+	# no busybox
+	return 1
 }
 
 # busybox_filter_wget_options ${wget_opts}
@@ -3116,3 +3128,17 @@
 		echo "${opts}"
 	fi
 }
+
+have_root_privileges()
+{
+	local retval
+
+	if [[ $(id -u) = 0 ]]
+	then
+		retval=0
+	else
+		retval=1
+	fi
+
+	return ${retval}
+}