From dda17d403570f1e9dc96246ec8ab5b1a6ea09728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sat, 29 Feb 2020 01:11:24 +0000 Subject: build.sh:buildp_dispatch(): silence command(1) output. build.sh:build(): turn ${_build_date_start} into scoped global ${BUILD_DATE_START} due to vars/invariants_zipdist.vars. subr/ex_pkg_exec.subr:ex_pkg_exec(): correctly set ${_rc} from pkg_${_pkg_name}_all()'s return status. subr/ex_pkg_exec.subr:ex_pkg_exec(): only set `finish' package build state given zero ${_rc} and ${_restart_at}. --- build.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index b281c7e0..71565215 100755 --- a/build.sh +++ b/build.sh @@ -69,15 +69,16 @@ buildp_dispatch() { buildp_dispatch_pkg_state "${_msg}" "${@}"; ;; finish_group|start_group) buildp_dispatch_group_state "${_msg}" "${@}"; ;; - *) if command -v "buildp_dispatch_${_msg}"; then + *) if command -v "buildp_dispatch_${_msg}" >/dev/null 2>&1; then "buildp_dispatch_${_msg}" "${@}"; fi; ;; esac; }; build() { - local _build_date_start="" _build_time_hours=0 _build_time_mins=0 _build_time_secs=0 \ - BUILD_NFAIL=0 BUILD_NFINI=0 BUILD_NSKIP=0 BUILD_PKGS_FAILED="" EX_PKG_DISPATCH_UNKNOWN=""; + local _build_time_hours=0 _build_time_mins=0 _build_time_secs=0 \ + BUILD_DATE_START="" BUILD_NFAIL=0 BUILD_NFINI=0 BUILD_NSKIP=0 \ + BUILD_PKGS_FAILED="" EX_PKG_DISPATCH_UNKNOWN=""; if trap "buildp_ast abort" HUP INT TERM USR1 USR2\ && trap "buildp_ast exit" EXIT\ && . ./subr/build_init.subr && build_init "${@}"; then -- cgit v1.2.3