More clean/distclean fixups

3 files changed, 22 insertions, 25 deletions

diff --git a/scripts/builder/build-clean b/scripts/builder/build-clean
index 87e34ad..09e417a 100755
--- a/scripts/builder/build-clean
+++ b/scripts/builder/build-clean
@@ -4,18 +4,20 @@ eval $(build query --environ "${1}")
 
 if [ -z "${NOCLEAN}" ]; then
 	echo "cleaning: ${1}"
-	if [ -e "${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}" ]; then
-		cd "${SYSROOT}"
-		cat "${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}" | xargs -0 rm &
-	fi
 	if [ -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ]; then
 		rm "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" &
 	fi
-	rm -rf "${W}" &
-
+	if [ -f "${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}" ]; then
+		cd "${SYSROOT}"
+		cat "var/db/binpkgs/${CATEGORY}/${NAME}" | xargs -0 rm &
+	fi
+	if [ -d "${W}" ]; then
+		rm -rf "${W}" &
+	fi
 
 	wait
 
+	# Clobber our package marker.
 	if [ "${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}" ]; then
 		rm "${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}"
 	fi
diff --git a/scripts/builder/build-distclean b/scripts/builder/build-distclean
index 911c735..6b4499d 100755
--- a/scripts/builder/build-distclean
+++ b/scripts/builder/build-distclean
@@ -1,18 +1,10 @@
 #!/usr/bin/env build
 
 echo "distcleaning: ${1}"
-
 eval $(build query --environ "${1}")
-
-if [ -e "${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}" ]; then
-	cd "${SYSROOT}"
-	cat "${SYSROOT}/var/db/binpkgs/${CATEGORY}/${NAME}" | xargs -0 rm &
-fi
-if [ -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" ]; then
-	rm "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}.${ARCHIVE_FORMAT}" &
-fi
-rm -rf "${W}" &
-
-wait
+# Shutdown the NOCLEAN flag during DISTCLEAN
+NOCLEAN=
+export NOCLEAN
+build-clean "${1}"
 
 # vim: filetype=sh
diff --git a/scripts/builder/build-makedeps b/scripts/builder/build-makedeps
index d03acdd..8c44146 100755
--- a/scripts/builder/build-makedeps
+++ b/scripts/builder/build-makedeps
@@ -5,19 +5,21 @@ cat >"${BUILDER_MAKEFILE}" <<EOF
 all: packages_archive
 all_fetch: packages_fetch
 all_clean: packages_clean
-all_distclean: tmpdir_clean sysroot_clean artifacts_clean
+all_distclean: packages_clean sysroot_clean artifacts_clean
 all_archive: packages_archive
 all_install: packages_install
 all_makedeps:
 
 sysroot_clean:
-	@if [ -d "${SYSROOT}" ]; then echo cleaning: sysroot;rm -rf "${SYSROOT}";fi
-tmpdir_clean:
-	@if [ -d "${BUILDER_TMPDIR}" ]; then echo cleaning: tmpdir; (cd "${BUILDER_TMPDIR}" && rm -rf *);fi
+	@if [ -d "${SYSROOT}" ]; then \
+		echo "cleaning: sysroot" ; \
+		(cd "${SYSROOT}" && find . -delete) ; \
+	fi
 artifacts_clean:
-	@if [ -d "${BUILDER_ATFDIR}" ]; then echo cleaning: artifacts;rm -rf "${BUILDER_ATFDIR}";fi
-
-
+	@if [ -d "${BUILDER_ATFDIR}" ]; then \
+		echo "cleaning: artifacts" ; \
+		(cd "${BUILDER_ATFDIR}" && find . -delete) ; \
+	fi
 EOF
 
 PACKAGES=
@@ -85,6 +87,7 @@ for package in $(cd "${BUILDER_PKGDIR}" && echo */*); do
 	done
 
 cat <<EOF
+
 ##
 # ${CATEGORY}/${NAME} - ${DESCRIPTION}
 ${package_make}: ${package_archive}