From bf9edfaed49c4387e181be454602e0cc65fe4382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 1 Mar 2020 21:09:37 +0000
Subject: General cleanup, pt. III.

dist/dist_digest.dist: removes obsolete dist file.
etc/{build.usage,README.md}: updated.
groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group.
groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group.
groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set.
groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set.
groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set.
groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set.
midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF.
subr/rtl_fileop.subr: adds ch{mod,own} fileops.
vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file.
---
 dist/dist_zipdist.dist | 64 +++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 29 deletions(-)

(limited to 'dist/dist_zipdist.dist')

diff --git a/dist/dist_zipdist.dist b/dist/dist_zipdist.dist
index 36c45892..571dc0ce 100644
--- a/dist/dist_zipdist.dist
+++ b/dist/dist_zipdist.dist
@@ -13,35 +13,41 @@ pkg_dist_zipdist_all() {
 			fi;
 		done;
 		_dist_fname="${DEFAULT_ZIPDIST_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.zip";
-		if [ -e "${BUILD_WORKDIR}/zipdist" ]; then
-			rtl_fileop rm "${BUILD_WORKDIR}/zipdist";
-		fi;
-		rtl_fileop mkdir "${BUILD_WORKDIR}/zipdist";
-		"${BUILD_WORKDIR}/mpackage/mpackage.sh"				\
-			--defroot="${DEFAULT_ZIPDIST_DEFROOT}"			\
-			--flysyms						\
-			--minroot="${PREFIX_MINIPIX}"				\
-			--objroot="${BUILD_WORKDIR}"				\
-			--pkgroot="${BUILD_WORKDIR}/zipdist/pkgroot"		\
-			--product=Midipix					\
-			--subset="${_pkglist_fname}"				\
-			--symbols						\
-			--sysroot="${BUILD_WORKDIR}/zipdist/sysroot"		\
-			--target="${DEFAULT_TARGET}"				\
-			--tmproot="${BUILD_WORKDIR}/zipdist/tmproot"		\
-			--zipfile="${PREFIX}/${_dist_fname}";
-		echo "msg_pkg dist dist_zipdist Finished building deployable distribution ZIP archive." >&3;
-		rtl_log_msg info "Finished building deployable distribution ZIP archive.";
-		if [ -n "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" ]\
-		&& [ -x "$(which gpg 2>/dev/null)" ]\
-		&& gpg --list-keys "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" >/dev/null 2>&1; then
-			echo "msg_pkg dist dist_zipdist Signing deployable distribution ZIP archive..." >&3;
-			rtl_log_msg info "Signing deployable distribution ZIP archive...";
-			gpg --armor --passphrase-file /dev/null			\
-				--local-user "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}"	\
-				--sign "${PREFIX}/${_dist_fname}";
-			echo "msg_pkg dist dist_zipdist Signed deployable distribution ZIP archive." >&3;
-			rtl_log_msg info "Signed deployable distribution ZIP archive.";
+		if [ -e "${BUILD_WORKDIR}/zipdist" ]\
+		&& ! rtl_fileop rm "${BUILD_WORKDIR}/zipdist"; then
+			return 1;
+		elif ! rtl_fileop mkdir "${BUILD_WORKDIR}/zipdist"; then
+			return 1;
+		elif ! "${BUILD_WORKDIR}/mpackage/mpackage.sh"				\
+				--defroot="${DEFAULT_ZIPDIST_DEFROOT}"			\
+				--flysyms						\
+				--minroot="${PREFIX_MINIPIX}"				\
+				--objroot="${BUILD_WORKDIR}"				\
+				--pkgroot="${BUILD_WORKDIR}/zipdist/pkgroot"		\
+				--product=Midipix					\
+				--subset="${_pkglist_fname}"				\
+				--symbols						\
+				--sysroot="${BUILD_WORKDIR}/zipdist/sysroot"		\
+				--target="${DEFAULT_TARGET}"				\
+				--tmproot="${BUILD_WORKDIR}/zipdist/tmproot"		\
+				--zipfile="${PREFIX}/${_dist_fname}"; then
+			return 1;
+		else
+			echo "msg_pkg dist dist_zipdist Finished building deployable distribution ZIP archive." >&3;
+			rtl_log_msg info "Finished building deployable distribution ZIP archive.";
+			if [ -n "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" ]\
+			&& [ -x "$(which gpg 2>/dev/null)" ]\
+			&& gpg --list-keys "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" >/dev/null 2>&1; then
+				echo "msg_pkg dist dist_zipdist Signing deployable distribution ZIP archive..." >&3;
+				rtl_log_msg info "Signing deployable distribution ZIP archive...";
+				if ! gpg --armor --passphrase-file /dev/null		\
+					--local-user "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}"	\
+					--sign "${PREFIX}/${_dist_fname}"; then
+					return 1;
+				fi;
+				echo "msg_pkg dist dist_zipdist Signed deployable distribution ZIP archive." >&3;
+				rtl_log_msg info "Signed deployable distribution ZIP archive.";
+			fi;
 		fi;
 	fi;
 };
-- 
cgit v1.2.3