--- trunk/mage/usr/lib/mage/magequery.sh	2018/06/04 16:49:01	3094
+++ trunk/mage/usr/lib/mage/magequery.sh	2018/06/04 16:52:54	3095
@@ -26,10 +26,10 @@
 }
 
 # default args:
-GET_INVENTORY=false
-SEARCH_ONLY_PATH=false
-SEARCH_ONLY_CAT=false
-SEARCH_EXACT_FILENAME=false
+GET_INVENTORY=0
+SEARCH_ONLY_PATH=0
+SEARCH_ONLY_CAT=0
+SEARCH_EXACT_FILENAME=0
 
 # no params given, or is only an arg not ar param, exit
 if [[ $# -lt 1 ]] || [[ ${1:0:1} != - ]]
@@ -45,10 +45,10 @@
 		-n) shift; S_PNAME="$1"; if [[ -z ${S_PNAME} ]]; then print_usage; exit 1; fi ;;
 		-v) shift; S_PVER="$1"; if [[ -z ${S_PVER} ]]; then print_usage; exit 1; fi ;;
 		-b) shift; S_PBUILD="$1"; if [[ -z ${S_PBUILD} ]]; then print_usage; exit 1; fi ;;
-		-i) GET_INVENTORY="true" ;;
-		-f) SEARCH_ONLY_PATH="true"; shift; SEARCH_PATH="$1"; if [[ -z ${SEARCH_PATH} ]]; then print_usage; exit 1; fi ;;
-		-e) SEARCH_ONLY_PATH="true"; SEARCH_EXACT_FILENAME="true"; shift; SEARCH_PATH="$1"; if [[ -z ${SEARCH_PATH} ]]; then print_usage; exit 1; fi  ;;
-		-c) SEARCH_ONLY_CAT="true"; shift; SEARCH_CAT="$1"; if [[ -z ${SEARCH_CAT} ]]; then print_usage; exit 1; fi ;;
+		-i) GET_INVENTORY="1" ;;
+		-f) SEARCH_ONLY_PATH="1"; shift; SEARCH_PATH="$1"; if [[ -z ${SEARCH_PATH} ]]; then print_usage; exit 1; fi ;;
+		-e) SEARCH_ONLY_PATH="1"; SEARCH_EXACT_FILENAME="1"; shift; SEARCH_PATH="$1"; if [[ -z ${SEARCH_PATH} ]]; then print_usage; exit 1; fi  ;;
+		-c) SEARCH_ONLY_CAT="1"; shift; SEARCH_CAT="$1"; if [[ -z ${SEARCH_CAT} ]]; then print_usage; exit 1; fi ;;
 		-h) print_usage; exit 0 ;;
 		-*) print_usage; exit 1 ;;
 	esac
@@ -59,11 +59,11 @@
 source ${MAGERC}
 RETVAL=1
 
-if [[ ${SEARCH_ONLY_PATH} = true ]]
+if [[ ${SEARCH_ONLY_PATH} = 1 ]]
 then
 	unset S_PACKAGES
 	unset i pkg
-	if [[ ${SEARCH_EXACT_FILENAME} = true ]]
+	if [[ ${SEARCH_EXACT_FILENAME} = 1 ]]
 	then
 		# fix ++, which gets interpreted as a regex
 		SEARCH_PATH="${SEARCH_PATH//+/\\+}"
@@ -97,7 +97,7 @@
 	exit 0
 fi
 
-if [[ ${SEARCH_ONLY_CAT} = true ]]
+if [[ ${SEARCH_ONLY_CAT} = 1 ]]
 then
 	# no packages of SEARCH_CAT are installed
 	[[ ! -d ${MROOT}${INSTALLDB}/${SEARCH_CAT} ]] && exit 1
@@ -119,7 +119,7 @@
 	(( INSTALL_DATABASE_COUNT++ ))
 done
 
-if [[ ${GET_INVENTORY} = true ]]
+if [[ ${GET_INVENTORY} = 1 ]]
 then
 	# build the list first
 	for ((i=0; i<INSTALL_DATABASE_COUNT; i++))
@@ -134,20 +134,20 @@
 do
 	if [[ ${INSTALL_DATABASE_PNAME[${i}]} == ${S_PNAME} ]]
 	then
-		INST_PNAME=yes
+		INST_PNAME=1
 
 		if [[ -n ${S_PVER} ]]
 		then
 			if [[ ${INSTALL_DATABASE_PVER[${i}]} == ${S_PVER} ]]
 			then
-				INST_PVER=yes
+				INST_PVER=1
 			fi
 			
 			if [[ -n ${S_PBUILD} ]]
 			then
 				if [[ ${INSTALL_DATABASE_PBUILD[${i}]} == ${S_PBUILD} ]]
 				then
-					INST_PBUILD=yes
+					INST_PBUILD=1
 				fi
 			fi
 		fi
@@ -155,7 +155,7 @@
 		# search for pname only
 		if [[ -n ${S_PNAME} ]] && [[ -z ${S_PVER} ]] && [[ -z ${S_PBUILD} ]]
 		then
-			if [[ ${INST_PNAME} = yes ]]
+			if [[ ${INST_PNAME} = 1 ]]
 			then
 				echo "${S_PNAME} is installed [ ${INSTALL_DATABASE_PCAT[${i}]}/${INSTALL_DATABASE_PNAME[${i}]}-${INSTALL_DATABASE_PVER[${i}]}-${INSTALL_DATABASE_PBUILD[${i}]} ]"
 				RETVAL=0
@@ -166,7 +166,7 @@
 		# search for pname and pver
 		if [[ -n ${S_PNAME} ]] && [[ -n ${S_PVER} ]] && [[ -z ${S_PBUILD} ]]
 		then
-			if [[ ${INST_PNAME} = yes ]] && [[ ${INST_PVER} = yes ]]
+			if [[ ${INST_PNAME} = 1 ]] && [[ ${INST_PVER} = 1 ]]
 			then
 				echo "${S_PNAME}-${S_PVER} is installed [ ${INSTALL_DATABASE_PCAT[${i}]}/${INSTALL_DATABASE_PNAME[${i}]}-${INSTALL_DATABASE_PVER[${i}]}-${INSTALL_DATABASE_PBUILD[${i}]} ]"
 				RETVAL=0
@@ -177,7 +177,7 @@
 		# search for pname, pver and pbuild
 		if [[ -n ${S_PNAME} ]] && [[ -n ${S_PVER} ]] && [[ -n ${S_PBUILD} ]]
 		then
-			if [[ ${INST_PNAME} = yes ]] && [[ ${INST_PVER} = yes ]] && [[ ${INST_PBUILD} = yes ]]
+			if [[ ${INST_PNAME} = 1 ]] && [[ ${INST_PVER} = 1 ]] && [[ ${INST_PBUILD} = 1 ]]
 			then
 				echo "${S_PNAME}-${S_PVER}-${S_PBUILD} is installed [ ${INSTALL_DATABASE_PCAT[${i}]}/${INSTALL_DATABASE_PNAME[${i}]}-${INSTALL_DATABASE_PVER[${i}]}-${INSTALL_DATABASE_PBUILD[${i}]} ]"
 				RETVAL=0