diff options
| author | Mark Ferrell <major@homeonderanged.org> | 2014-04-28 09:57:39 -0700 |
|---|---|---|
| committer | Mark Ferrell <major@homeonderanged.org> | 2014-04-28 09:57:39 -0700 |
| commit | 52fd1dbe997194f69fb5af72a20c76ab8cd0c4f3 (patch) | |
| tree | 0f4d5968cb7e3bb87f8a8af5a99d5b1f296c4ab2 | |
| parent | 8a216c0624f83f1a9158833e84f95d0b22bc1b80 (diff) | |
Fix bug in build-make-distclean
* The 'build distclean' was not properly implemented, and as such it was not
cleaning NOCLEAN flagged packages.
| -rwxr-xr-x | libexec/build-make-clean | 30 | ||||
| -rwxr-xr-x | libexec/build-make-distclean | 9 |
2 files changed, 19 insertions, 20 deletions
diff --git a/libexec/build-make-clean b/libexec/build-make-clean index 248d087..3fe4b67 100755 --- a/libexec/build-make-clean +++ b/libexec/build-make-clean @@ -1,22 +1,28 @@ #!/usr/bin/env build -build_make_clean() -{( +build_make_distclean() +{ load_rules "${1}" + import build-make-uninstall - if [ -z "${NOCLEAN}" ]; then - import build-make-uninstall + if [ -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${ARCHIVE_FORMAT}" ]; then + rm "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${ARCHIVE_FORMAT}" & + fi + if [ -d "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" ]; then + rm -rf "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" & + fi - if [ -f "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${ARCHIVE_FORMAT}" ]; then - rm "${BUILDER_ATFDIR}/${CATEGORY}/${NAME}-${VERSION}-${RELEASE}.${ARCHIVE_FORMAT}" & - fi - if [ -d "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" ]; then - rm -rf "${BUILDER_TMPDIR}/${CATEGORY}/${NAME}" & - fi + build_make_uninstall "${1}" & - build_make_uninstall "${1}" & + wait +} - wait +build_make_clean() +{( + load_rules "${1}" + + if [ -z "${NOCLEAN}" ]; then + build_make_distclean "${1}" fi )} diff --git a/libexec/build-make-distclean b/libexec/build-make-distclean index 2be17a8..9e73919 100755 --- a/libexec/build-make-distclean +++ b/libexec/build-make-distclean @@ -1,12 +1,6 @@ #!/usr/bin/env build -build_make_distclean() -{( - import build-make-clean - unset NOCLEAN - export NOCLEAN - build_make_clean "${1}" -)} +import build-make-clean if test "${BUILDER_CALL_STACK}" = '__main__'; then simple_usage 'distclean' '[all|[<category>/]<package|all>]' "$@" @@ -14,5 +8,4 @@ if test "${BUILDER_CALL_STACK}" = '__main__'; then build_make_distclean "${@}" fi - # vim: filetype=sh |