From 2b85d0a1de9ec57aab6293163d9885d76a47035c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 25 Feb 2020 17:26:03 +0000 Subject: General cleanup, pt. I. --- subr/pkg_clean.subr | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'subr/pkg_clean.subr') diff --git a/subr/pkg_clean.subr b/subr/pkg_clean.subr index f9f9a204..40d56540 100644 --- a/subr/pkg_clean.subr +++ b/subr/pkg_clean.subr @@ -1,20 +1,18 @@ # -# set -o errexit -o noglob are assumed. +# set +o errexit -o noglob is assumed. # pkg_clean() { - local _dir=""; - if [ -n "${PKG_NO_CLEAN}" ]; then - return 0; - fi; - if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" , build; then - ex_rtl_fileop rm "${PKG_BUILD_DIR}"; - fi; - if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" , dest; then - ex_rtl_fileop rm "${PKG_DESTDIR}"; - fi; - if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" , src; then - ex_rtl_fileop rm "${PKG_BASE_DIR}/${PKG_SUBDIR}"; + if [ "${PKG_NO_CLEAN:-0}" -eq 0 ]; then + if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" "build" ","; then + ex_rtl_fileop rm "${PKG_BUILD_DIR}" || return "${?}"; + fi; + if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" "dest" ","; then + ex_rtl_fileop rm "${PKG_DESTDIR}" || return "${?}"; + fi; + if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" "src" ","; then + ex_rtl_fileop rm "${PKG_BASE_DIR}/${PKG_SUBDIR}" || return "${?}"; + fi; fi; }; -- cgit v1.2.3