From ed4109698b2e5ff64d7f8d8c5349b512a6d2de3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sat, 19 Jan 2019 18:26:53 +0000
Subject: build.sh, subr/build_checks.subr, vars/midipix.vars: removes
 ${DEFAULT_CHECK_PREREQ_{CMDS,FILES{,_DYNAMIC},PERL_MODULES}}.
 etc/build.usage: update target list. subr/build_checks.subr: merges remaining
 checks into subr/build_init.subr.

---
 subr/build_checks.subr | 44 --------------------------------------------
 subr/build_init.subr   | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 subr/build_checks.subr

(limited to 'subr')

diff --git a/subr/build_checks.subr b/subr/build_checks.subr
deleted file mode 100644
index 1955d585..00000000
--- a/subr/build_checks.subr
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# set -o noglob is assumed.
-#
-
-build_checks() {
-	local __="" _exit="" _pname="";
-	for __ in ${DEFAULT_CHECK_PATH_VARS}; do
-		if [ -z "${___:=$(ex_rtl_get_var_unsafe "${__}")}" ]; then
-			ex_rtl_log_msg failexit "Error: variable \`${__}' is empty or unset.";
-		elif [ "${___#* *}" != "${___}" ]; then
-			ex_rtl_log_msg failexit "Error: variable \`${__}' contains one or more whitespace characters.";
-		fi;
-	done;
-	for __ in ${DEFAULT_CHECK_PREREQ_CMDS} $(eval echo ${DEFAULT_CHECK_PREREQ_FILES_DYNAMIC}) ${DEFAULT_CHECK_PREREQ_FILES}; do
-		if [ "${__#/}" != "${__}" ]; then
-			if [ ! -e "${__}" ]; then
-				ex_rtl_log_msg fail "Error: missing prerequisite file \`${__}'.";
-				_exit=1;
-			fi;
-		else
-			if ! ex_rtl_test_cmd "${__}"; then
-				ex_rtl_log_msg fail "Error: missing prerequisite command \`${__}'.";
-				_exit=1;
-			fi;
-		fi;
-	done;
-	for __ in ${DEFAULT_CHECK_PREREQ_PERL_MODULES}; do
-		if ! perl -M"${__}" -e "" 2>/dev/null; then
-			ex_rtl_log_msg fail "Error: missing prerequisite Perl module \`${__}'.";
-			_exit=1;
-		fi;
-	done;
-	if [ ${_exit:-0} = 1 ]; then
-		exit 1;
-	fi;
-	if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" , prefix; then
-		ex_rtl_log_msg info "-C prefix specified, cleaning prefix...";
-		for _pname in ${DEFAULT_CLEAR_PREFIX_PATHS}; do
-			ex_rtl_fileop rm ${PREFIX}/${_pname};
-		done;
-	fi;
-};
-
-# vim:filetype=sh
diff --git a/subr/build_init.subr b/subr/build_init.subr
index c7ec7d4f..3bd6af11 100644
--- a/subr/build_init.subr
+++ b/subr/build_init.subr
@@ -9,7 +9,7 @@ build_fini() {
 };
 
 build_init() {
-	local __="" _env_vars="" _env_vars_except="" _env_var="" _log_last_fname="" _log_last_ts="";
+	local __="" _env_vars="" _env_vars_except="" _env_var="" _log_last_fname="" _log_last_ts="" _vname="" _vname_val="";
 	set -o noglob; umask 022;
 	if [ -z "${DEFAULT_BUILD_CPUS}" ]\
 	&& [ -e /proc/cpuinfo ]; then
@@ -84,6 +84,20 @@ build_init() {
 		HUP INT TERM USR1 USR2;
 	trap "rm -f "${DEFAULT_BUILD_STATUS_IN_PROGRESS_FNAME}";"	\
 		EXIT;
+	for _vname in ${DEFAULT_CHECK_PATH_VARS}; do
+		_vname_val="$(ex_rtl_get_var_unsafe "${_vname}")";
+		if [ -z "${_vname_val}" ]; then
+			ex_rtl_log_msg failexit "Error: variable \`${_vname}' is empty or unset.";
+		elif [ "${_vname_val#* *}" != "${_vname_val}" ]; then
+			ex_rtl_log_msg failexit "Error: variable \`${_vname}' contains one or more whitespace characters.";
+		fi;
+	done;
+	if ex_rtl_lmatch "${ARG_CLEAN_BUILDS}" , prefix; then
+		ex_rtl_log_msg info "-C prefix specified, cleaning prefix...";
+		for _pname in ${DEFAULT_CLEAR_PREFIX_PATHS}; do
+			ex_rtl_fileop rm "${PREFIX}/${_pname}";
+		done;
+	fi;
 };
 
 # vim:filetype=sh
-- 
cgit v1.2.3