aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Ferrell <major@homeonderanged.org>2012-03-29 14:03:34 -0500
committerMark Ferrell <major@homeonderanged.org>2012-03-30 11:56:44 -0500
commite6ac0e82d4c97f443df2ee37684397aa5dc2c675 (patch)
treea284981d2302a283318631382fca377493782d25
parent6ca66744ba159e15b5e9a77f6d81b4e5dc8d767a (diff)
Clobber the workdir w/out all the overhead
-rwxr-xr-xscripts/builder/build-clean18
-rwxr-xr-xscripts/builder/build-distclean10
2 files changed, 11 insertions, 17 deletions
diff --git a/scripts/builder/build-clean b/scripts/builder/build-clean
index 6860061..373f4fb 100755
--- a/scripts/builder/build-clean
+++ b/scripts/builder/build-clean
@@ -2,19 +2,15 @@
echo "cleaning: ${1}"
-case "${PKG_NAME}" in
-# FIXME need a way to flag a path as NOCLEAN
-(buildtools/*) rm -f "$(build query --workdir "${1}")/.installed"; exit 0;;
-esac
eval $(build query --environ "${1}")
-
-for dir in "$(build query --workdir "${1}")" "$(build query --destdir "${1}")"; do
- if [ -d "${dir}" ]; then
- rm -rf "${dir}" &
+# FIXME need a way to flag a path as NOCLEAN
+if [ "${CATEGORY}" = "buildtools" ]; then
+ rm -f "${W}/.installed"
+else
+ if [ -d "${W}" ]; then
+ rm -rf "${W}"
fi
-done
-
-wait
+fi
# vim: filetype=sh
diff --git a/scripts/builder/build-distclean b/scripts/builder/build-distclean
index 585b3d0..ca0e400 100755
--- a/scripts/builder/build-distclean
+++ b/scripts/builder/build-distclean
@@ -2,12 +2,10 @@
echo "dist-cleaning: ${1}"
-for dir in "$(build query --workdir "${1}")" "$(build query --destdir "${1}")"; do
- if [ -d "${dir}" ]; then
- rm -rf "${dir}" &
- fi
-done
+eval $(build query --environ "${1}")
-wait
+if [ -d "${W}" ]; then
+ rm -rf "${W}"
+fi
# vim: filetype=sh