From 0eaee4ebe96cb25601d8a4ea79bd475240c8fdf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sat, 19 Jan 2019 02:36:57 +0000 Subject: build.sh, etc/build.usage, subr/*: merges {-[ptz],--rpm} into -D {minipix,pkg,rpm,t{bz2,gz,xz},zipdist}. subr/{build_args,pkg_clean}.subr: cleanup ${ARG_CLEAN_BUILDS} usage. vars/build.vars:dist: merged into invariants. vars/invariants_minipix.vars: adapted from vars/dist_minipix_dist.vars. vars/{invariants_tarballs,midipix}.vars: don't produce source tarballs. --- subr/pkg_clean.subr | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'subr/pkg_clean.subr') diff --git a/subr/pkg_clean.subr b/subr/pkg_clean.subr index 8128dfd4..dfc83b76 100644 --- a/subr/pkg_clean.subr +++ b/subr/pkg_clean.subr @@ -7,14 +7,15 @@ pkg_clean() { if [ -n "${PKG_DEPS_BASE}" ]; then return 0; fi; - for _dir in ${ARG_CLEAN_BUILDS}; do - case "${_dir}" in - build) ex_rtl_fileop rm "${PKG_BUILD_DIR}"; ;; - src) ex_rtl_fileop rm "${PKG_BASE_DIR}/${PKG_SUBDIR}"; ;; - dest) ex_rtl_fileop rm "${PKG_DESTDIR}"; ;; - *) return 1; ;; - esac; - done; + 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}"; + fi; }; # vim:filetype=sh -- cgit v1.2.3