--- trunk/mage/usr/lib/mage/mage4.functions.sh	2011/05/27 12:56:38	1293
+++ trunk/mage/usr/lib/mage/mage4.functions.sh	2011/08/30 10:39:28	1502
@@ -1365,7 +1365,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
@@ -1575,7 +1575,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)
@@ -2462,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
@@ -2475,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
@@ -2487,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
@@ -3089,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}