From f6a5cb3531f9333cfdf4b061e671a84a7ef6c530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <lucio@lucioillanes.de>
Date: Tue, 21 Nov 2017 18:02:50 +0000
Subject: {build.sh,subr/pre_setup_args.subr}: split. subr/pre_setup_env.subr:
 set -o noglob.

---
 build.sh | 52 ++++++----------------------------------------------
 1 file changed, 6 insertions(+), 46 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index 45944e9a..60c78aba 100755
--- a/build.sh
+++ b/build.sh
@@ -2,48 +2,9 @@
 # Copyright (c) 2016, 2017 Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
 #
 
-#
-#
-#
-for __ in subr/*.subr; do . "${__}"; done;
-set -o noglob;
-while [ ${#} -gt 0 ]; do
-case ${1} in
--4)	ARG_IPV4_ONLY=1; ;;
--6)	ARG_IPV6_ONLY=1; ;;
--c)	ARG_CLEAN=1; ;;
--N)	ARG_OFFLINE=1; ;;
--i)	ARG_IGNORE_SHA256SUMS=1; ;;
--R)	ARG_RELAXED=1; ;;
---debug-minipix)
-	ARG_DEBUG_MINIPIX=1; ;;
--t*)	ARG_TARBALL=1; [ "${1#-t.}" != "${1}" ] && TARBALL_SUFFIX="${1#-t.}"; ;;
--v)	ARG_VERBOSE=1; ;;
--x)	ARG_XTRACE=1; set -o xtrace; ;;
--a)	[ -z "${2}" ] && exec cat etc/build.usage || ARCH="${2}"; shift; ;;
--b)	[ -z "${2}" ] && exec cat etc/build.usage || BUILD="${2}"; shift; ;;
--r)	if [ -z "${2}" ]; then
-		exec cat build.usage;
-	elif [ "${2%:*}" = "${2}" ]; then
-		ARG_RESTART="${2}";
-	else
-		ARG_RESTART="${2%:*}"; ARG_RESTART_AT="${2#*:}";
-	fi;
-	BUILD_PACKAGES_RESTART="$(echo ${ARG_RESTART} | sed "s/,/ /g")";
-	shift; ;;
-*=*)	set_var_unsafe "${1%%=*}" "${1#*=}"; ;;
-*)	if lmatch "${1}" " " "${ALL_TARGETS}"; then
-		BUILD_TARGETS_META="${BUILD_TARGETS_META:+${BUILD_TARGETS_META} }${1}";
-	else
-		exec cat etc/build.usage;
-	fi; ;;
-esac; shift; done;
-pre_setup_env; pre_check; pre_subdirs; build_files_init;
-
-#
-#
-#
-{(
+for __ in $(find subr -name *.subr); do . "${__}"; done;
+pre_setup_args "${@}"; pre_setup_env; pre_check; pre_subdirs;
+build_files_init; {(
 log_msg info "Build started by ${BUILD_USER:=${USER}}@${BUILD_HNAME:=$(hostname)} at ${BUILD_DATE_START}.";
 log_env_vars "build (global)" ${LOG_ENV_VARS};
 for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do
@@ -71,8 +32,7 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do
 	if [ "${BUILD_SCRIPT_RC:-0}" -ne 0 ]; then
 		break;
 	fi;
-done;
-build_files_fini;
+done; build_files_fini;
 log_msg info "${BUILD_NFINI} finished, ${BUILD_NSKIP} skipped, and ${BUILD_NFAIL} failed builds in ${BUILD_NBUILT} build script(s).";
 log_msg info "Build time: ${BUILD_TIMES_HOURS} hour(s), ${BUILD_TIMES_MINUTES} minute(s), and ${BUILD_TIMES_SECS} second(s).";
 if [ ${ARG_RELAXED:-0} -eq 1 ]\
@@ -80,10 +40,10 @@ if [ ${ARG_RELAXED:-0} -eq 1 ]\
 	log_msg info "Build script failure(s) in: ${BUILD_PKGS_FAILED}.";
 fi;
 exit "${BUILD_SCRIPT_RC:-0}")} 2>&1 | tee "${BUILD_LOG_FNAME}" & TEE_PID="${!}";
+
 trap "rm -f ${BUILD_STATUS_IN_PROGRESS_FNAME};	\
 	log_msg fail \"Build aborted.\";	\
 	echo kill ${TEE_PID};			\
-	kill ${TEE_PID}" HUP INT TERM USR1 USR2;
-wait;
+	kill ${TEE_PID}" HUP INT TERM USR1 USR2; wait;
 
 # vim:filetype=sh
-- 
cgit v1.2.3