Cleanup the calling of build-query

6 files changed, 12 insertions, 8 deletions

diff --git a/scripts/build b/scripts/build
index 45f7789..df081af 100755
--- a/scripts/build
+++ b/scripts/build
@@ -112,7 +112,7 @@ import()
 	# There is a bit of a performance penalty here in that the query
 	# routine will source the build-rules to finish collecting data, so we
 	# end up sourcing the Buildrules twice.
-	eval $(build query -E "${1}")
+	eval $(build-query --environ "${1}")
 
 	# Source in the category Buildrules
 	if [ -f "${BUILDER_PKGDIR}/${CATEGORY}/.buildrules" ]; then
@@ -343,7 +343,7 @@ export BUILDER_MAKEFILE
 packages=
 for package in "$@"; do
 	if [ "${package}" != "all" ]; then
-		package="$(build query --pkgname "${package}")"
+		package="$(build-query --pkgname "${package}")"
 	fi
 	package="$(echo "${package}"|tr '/-' '__')"
 	packages="${packages} ${package}_${ACTION}"
diff --git a/scripts/builder/build-archive b/scripts/builder/build-archive
index 24db888..11f89d7 100755
--- a/scripts/builder/build-archive
+++ b/scripts/builder/build-archive
@@ -1,7 +1,7 @@
 #!/usr/bin/env build
 
 echo "archiving: ${1}"
-eval $(build query --environ "${1}")
+eval $(build-query --environ "${1}")
 mkenv "archive"
 
 ARCHIVE_TMP1=
diff --git a/scripts/builder/build-clean b/scripts/builder/build-clean
index e22aaac..05c49ec 100755
--- a/scripts/builder/build-clean
+++ b/scripts/builder/build-clean
@@ -1,6 +1,6 @@
 #!/usr/bin/env build
 
-eval $(build query --environ "${1}")
+eval $(build-query --environ "${1}")
 
 if [ -z "${NOCLEAN}" ]; then
 	echo "cleaning: ${1}"
diff --git a/scripts/builder/build-distclean b/scripts/builder/build-distclean
index fa08e10..2cf0cc9 100755
--- a/scripts/builder/build-distclean
+++ b/scripts/builder/build-distclean
@@ -1,7 +1,7 @@
 #!/usr/bin/env build
 
 echo "distcleaning: ${1}"
-eval $(build query --environ "${1}")
+eval $(build-query --environ "${1}")
 
 if [ -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ]; then
 	rm "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" &
diff --git a/scripts/builder/build-install b/scripts/builder/build-install
index 9c45c01..e7e1d2b 100755
--- a/scripts/builder/build-install
+++ b/scripts/builder/build-install
@@ -1,7 +1,7 @@
 #!/usr/bin/env build
 
 echo "installing: ${1}"
-eval $(build query --environ "${1}")
+eval $(build-query --environ "${1}")
 
 if [ ! -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ]; then
 	die "archive does not exist for package '${NAME}'"
diff --git a/scripts/builder/build-makedeps b/scripts/builder/build-makedeps
index a0b1119..7732edf 100755
--- a/scripts/builder/build-makedeps
+++ b/scripts/builder/build-makedeps
@@ -30,7 +30,11 @@ PACKAGES_INSTALL=
 PACKAGES_CLEAN=
 PACKAGES_DISTCLEAN=
 for package in $(cd "${BUILDER_PKGDIR}" && echo */*); do
-	if ! eval $(build query --environ "${package}"); then
+	if [ ! -f "${BUILDER_PKGDIR}/${package}/Buildrules" ]; then
+		error "no rulesfile for package '${package}'"
+		continue
+	fi
+	if ! eval $(build-query --environ "${package}"); then
 		die "in package '${package}'"
 	fi
 
@@ -74,7 +78,7 @@ for package in $(cd "${BUILDER_PKGDIR}" && echo */*); do
 	for pkg_dep in ${BDEPENDS}; do
 		if [ ! -d "${BUILDER_PKGDIR}/${pkg_dep}" ]; then
 			if [ ! -d "${BUILDER_PKGDIR}/${PROJECT}/${pkg_dep}" ]; then
-				if ! build query --exists "${pkg_dep}"; then
+				if ! build-query --exists "${pkg_dep}"; then
 					die "bad BDEPENDS in package '${package}'"
 				fi
 			elif [ ! -f "${BUILDER_PKGDIR}/${PROJECT}/${pkg_dep}/Buildrules" ]; then