From ec19f02f81c206f54a89ef7e1f49715e90470c31 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: Sun, 3 Dec 2017 16:10:05 +0000
Subject: Separate front end (build.sh, subr/build_*) from dispatcher.

---
 subr/ex_rtl_log.subr | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

(limited to 'subr/ex_rtl_log.subr')

diff --git a/subr/ex_rtl_log.subr b/subr/ex_rtl_log.subr
index c44085a6..71e52fa2 100644
--- a/subr/ex_rtl_log.subr
+++ b/subr/ex_rtl_log.subr
@@ -2,9 +2,9 @@
 # set -o errexit -o noglob are assumed.
 #
 
-ex_log_env_vars() {
+ex_rtl_log_env_vars() {
 	local _nvar=1 _arg _arg_len_max=0;
-	ex_log_msg info "Variables for this ${1:-build}:"; shift;
+	ex_rtl_log_msg info "Variables for this ${1:-build}:"; shift;
 	while [ ${_nvar} -le ${#} ]; do
 		_arg="$(eval echo \${${_nvar}})";
 		_arg="${_arg%%=*}";
@@ -13,38 +13,44 @@ ex_log_env_vars() {
 		fi; : $((_nvar+=1));
 	done;
 	while [ ${#} -gt 0 ]; do
-		ex_log_msg info "$(printf					\
+		ex_rtl_log_msg info "$(printf			\
 			"%${_arg_len_max}.${_arg_len_max}s=%s"	\
-			"${1%%=*}" "$(ex_get_var_unsafe ${1#*=})")";
+			"${1%%=*}" "$(ex_rtl_get_var_unsafe ${1#*=})")";
 		shift;
 	done;
 };
 
-ex_log_msg() {
+ex_rtl_log_set_vnfo_lvl() {
+	EXP_RTL_LOG_VNFO_LVL="${1}";
+};
+
+ex_rtl_log_msg() {
 	local _lvl="${1}"; shift;
 	if [ "${_lvl}" = vnfo ]\
-	&& [ ${ARG_VERBOSE:-0} -eq 0 ]; then
+	&& [ "${EXP_RTL_LOG_VNFO_LVL:-0}" -lt 1 ]; then
 		return;
 	elif [ "${_lvl}" = vvfo ]\
-	&& [ ${ARG_VERBOSE2:-0} -eq 0 ]; then
+	&& [ "${EXP_RTL_LOG_VNFO_LVL:-0}" -lt 2 ]; then
 		return;
 	elif [ "${_lvl}" = vvvo ]\
-	&& [ ${ARG_VERBOSE3:-0} -eq 0 ]; then
+	&& [ "${EXP_RTL_LOG_VNFO_LVL:-0}" -lt 3 ]; then
 		return;
 	fi;
 	case "${_lvl}" in
-		failexit) printf "\033[0m\033[${LOG_MSG_FAIL_COLOUR}m"; ;;
-		fail) printf "\033[0m\033[${LOG_MSG_FAIL_COLOUR}m"; ;;
-		info) printf "\033[0m\033[${LOG_MSG_INFO_COLOUR}m"; ;;
-		vnfo) printf "\033[0m\033[${LOG_MSG_VNFO_COLOUR}m"; ;;
-		vvfo) printf "\033[0m\033[${LOG_MSG_VVFO_COLOUR}m"; ;;
-		vvvo) printf "\033[0m\033[${LOG_MSG_VVVO_COLOUR}m"; ;;
-		succ) printf "\033[0m\033[${LOG_MSG_SUCC_COLOUR}m"; ;;
+		failexit) printf "\033[0m\033[${DEFAULT_LOG_MSG_FAIL_COLOUR}m"; ;;
+		fail) printf "\033[0m\033[${DEFAULT_LOG_MSG_FAIL_COLOUR}m"; ;;
+		info) printf "\033[0m\033[${DEFAULT_LOG_MSG_INFO_COLOUR}m"; ;;
+		inf2) printf "\033[0m\033[${DEFAULT_LOG_MSG_INF2_COLOUR}m"; ;;
+		vnfo) printf "\033[0m\033[${DEFAULT_LOG_MSG_VNFO_COLOUR}m"; ;;
+		vvfo) printf "\033[0m\033[${DEFAULT_LOG_MSG_VVFO_COLOUR}m"; ;;
+		vvvo) printf "\033[0m\033[${DEFAULT_LOG_MSG_VVVO_COLOUR}m"; ;;
+		succ) printf "\033[0m\033[${DEFAULT_LOG_MSG_SUCC_COLOUR}m"; ;;
+		suc2) printf "\033[0m\033[${DEFAULT_LOG_MSG_SUC2_COLOUR}m"; ;;
 	esac;
 	if [ ${#} -gt 1 ]; then
-		printf "==> %s %s %s\033[0m\n" "$(ex_date)" "${1}" "$*";
+		printf "==> %s %s %s\033[0m\n" "$(ex_rtl_date)" "${1}" "$*";
 	else
-		printf "==> %s %s\033[0m\n" "$(ex_date)" "${1}";
+		printf "==> %s %s\033[0m\n" "$(ex_rtl_date)" "${1}";
 	fi; [ ${_lvl} = failexit ] && exit 1 || return 0;
 };
 
-- 
cgit v1.2.3