--- trunk/mage/usr/lib/mage/magequery.sh	2011/08/30 13:04:02	1507
+++ trunk/mage/usr/lib/mage/magequery.sh	2011/12/27 09:11:32	1546
@@ -53,7 +53,7 @@
 done
 
 source /etc/mage.rc.global
-source /etc/mage.rc
+source ${MAGERC}
 RETVAL=1
 
 if [[ ${SEARCH_ONLY_PATH} = true ]]
@@ -62,6 +62,10 @@
 	unset i pkg
 	if [[ ${SEARCH_EXACT_FILENAME} = true ]]
 	then
+		# fix ++, which gets interpreted as a regex
+		SEARCH_PATH="${SEARCH_PATH//+/\\+}"
+		# fix [, which gets interpreted as a regex
+		SEARCH_PATH="${SEARCH_PATH//[/\\[}"
 		S_CANDIDATES=$(egrep -rl "^${SEARCH_PATH}§" ${INSTALLDB})
 	else
 		S_CANDIDATES=$(fgrep -rl "${SEARCH_PATH}" ${INSTALLDB})