From 4243a1676e1be4de207c850825c0e84c00b8151a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?= Date: Tue, 21 Mar 2023 11:05:34 +0100 Subject: Document subr.rtl/*.subr functions, pt. IV. --- subr.ex/ex_init.subr | 20 ++++++++++---------- subr.ex/ex_pkg.subr | 2 +- subr.ex/ex_pkg_dispatch.subr | 4 ++-- subr.ex/ex_pkg_env.subr | 10 +++++----- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'subr.ex') diff --git a/subr.ex/ex_init.subr b/subr.ex/ex_init.subr index 3125aadf..71bcc672 100644 --- a/subr.ex/ex_init.subr +++ b/subr.ex/ex_init.subr @@ -291,8 +291,8 @@ ex_init_files() { if rtl_lmatch "${_eif_rclean_builds}" $"prefix" ","; then trap "rm -f \"${_eif_build_status_in_progress_fname}\" 2>/dev/null; - rtl_log_msg \"fatalexit\" \"${MSG_build_aborted}\"" HUP INT TERM USR1 USR2; - rtl_log_msg "info" "${MSG_build_clean_prefix}"; + rtl_log_msgV \"fatalexit\" \"${MSG_build_aborted}\"" HUP INT TERM USR1 USR2; + rtl_log_msgV "info" "${MSG_build_clean_prefix}"; for _eif_pname in ${_eif_clear_prefix_paths}; do if ! rtl_fileop rm "${_eif_prefix}/${_eif_pname}"; then @@ -327,11 +327,11 @@ ex_init_logging() { case "${_eil_verbose}" in 0) if eval [ \"\${#${_eil_rverbose_tags}}\" -eq 0 ]; then - rtl_log_enable_tags "${LOG_TAGS_normal}"; + rtl_log_enable_tagsV "${LOG_TAGS_normal}"; fi; ;; - 1) rtl_log_enable_tags "${LOG_TAGS_verbose}"; ;; + 1) rtl_log_enable_tagsV "${LOG_TAGS_verbose}"; ;; *) _eil_rc=1; rtl_setrstatus "${_eil_rstatus}" 'invalid verbosity level (max. -v)'; @@ -343,7 +343,7 @@ ex_init_logging() { eval _eil_tags="\${${_eil_rverbose_tags}}"; case "${_eil_tags}" in - +*) rtl_log_enable_tags "${LOG_TAGS_normal}"; + +*) rtl_log_enable_tagsV "${LOG_TAGS_normal}"; eval ${_eil_rverbose_tags}="\${${_eil_rverbose_tags}#+}"; ;; @@ -356,17 +356,17 @@ ex_init_logging() { for _eil_tag in ${_eil_tags}; do case "${_eil_tag}" in - all) rtl_log_enable_tags "${LOG_TAGS_all}"; ;; + all) rtl_log_enable_tagsV "${LOG_TAGS_all}"; ;; clear|none) rtl_log_clear_tags; ;; - normal) rtl_log_enable_tags "${LOG_TAGS_normal}"; ;; + normal) rtl_log_enable_tagsV "${LOG_TAGS_normal}"; ;; - verbose) rtl_log_enable_tags "${LOG_TAGS_verbose}"; ;; + verbose) rtl_log_enable_tagsV "${LOG_TAGS_verbose}"; ;; *) rtl_lsearch_patternl2 \$LOG_TAGS_all \$_eil_tags_enable "${_eil_tag}" ","; if [ "${#_eil_tags_enable}" -gt 0 ]; then - rtl_log_enable_tags "${_eil_tags_enable}"; + rtl_log_enable_tagsV "${_eil_tags_enable}"; else _eil_rc=1; rtl_setrstatus "${_eil_rstatus}" 'invalid log tag or tag pattern \`'"${_eil_tag}"''\''.'; @@ -392,7 +392,7 @@ ex_init_prereqs() { local _eip_rstatus="${1#\$}" _eip_prereqs="${2}" \ _eip_rc=0; - if ! rtl_check_prereqs "${_eip_rstatus}" ${_eip_prereqs}; then + if ! rtl_check_prereqsV "${_eip_rstatus}" ${_eip_prereqs}; then _eip_rc=1; elif ! awk -V 2>/dev/null | grep -q "^GNU Awk "; then _eip_rc=1; diff --git a/subr.ex/ex_pkg.subr b/subr.ex/ex_pkg.subr index 978808a6..041faa4f 100644 --- a/subr.ex/ex_pkg.subr +++ b/subr.ex/ex_pkg.subr @@ -37,7 +37,7 @@ ex_pkg_check_depends() { && ! ex_pkg_state_test2 "${_epcd_workdir}" "${_epcd_pkg_name_depend}" finish; then if ! rtl_lmatch "${_epcd_rpkg_names}" "${_epcd_pkg_name_depend}"; then - rtl_log_msg "fatalexit" "${MSG_build_unknown_dep}" "${_epcd_pkg_name_depend}" "${_epcd_pkg_name}"; + rtl_log_msgV "fatalexit" "${MSG_build_unknown_dep}" "${_epcd_pkg_name_depend}" "${_epcd_pkg_name}"; else _epcd_dependfl=1; break; fi; diff --git a/subr.ex/ex_pkg_dispatch.subr b/subr.ex/ex_pkg_dispatch.subr index d95339ee..22917baa 100644 --- a/subr.ex/ex_pkg_dispatch.subr +++ b/subr.ex/ex_pkg_dispatch.subr @@ -341,7 +341,7 @@ ex_pkg_dispatch() { "${_epd_perc_group}"; then if rtl_fileop mkdir "${_epd_workdir}"\ - && rtl_log_msg "verbose" "${MSG_build_resolving_deps}" "${_epd_group_name}"\ + && rtl_log_msgV "verbose" "${MSG_build_resolving_deps}" "${_epd_group_name}"\ && exp_pkg_dispatch_expand_packages \ \$_epd_pkg_disabled \$_epd_pkg_finished \ \$_epd_pkg_names "${_epd_checkfl}" \ @@ -351,7 +351,7 @@ ex_pkg_dispatch() { && exp_pkg_dispatch_complete \ "${_epd_dispatch_fn}" "${_epd_group_name}" \ "${_epd_pkg_disabled}" "${_epd_pkg_finished}" \ - && rtl_log_msg "verbose" "${MSG_build_resolved_deps}" "${_epd_group_name}"\ + && rtl_log_msgV "verbose" "${MSG_build_resolved_deps}" "${_epd_group_name}"\ && rtl_llength \$_epd_pkg_dispatch_count_max \$_epd_pkg_names\ && [ "${_epd_pkg_dispatch_count_max}" -gt 0 ]; then diff --git a/subr.ex/ex_pkg_env.subr b/subr.ex/ex_pkg_env.subr index e2cfb1db..a34a2840 100644 --- a/subr.ex/ex_pkg_env.subr +++ b/subr.ex/ex_pkg_env.subr @@ -31,7 +31,7 @@ exp_pkg_env_defaults() { if [ "${PKG_SUBDIR:+1}" != 1 ]; then if [ "${PKG_URLS_GIT:+1}" = 1 ]\ && [ "${PKG_FNAME:+1}" = 1 ]; then - rtl_log_msg "fatalexit" "${MSG_pkg_fail_missing_vars}"; + rtl_log_msgV "fatalexit" "${MSG_pkg_fail_missing_vars}"; elif [ "${PKG_URLS_GIT:+1}" = 1 ]; then PKG_SUBDIR="${PKG_URLS_GIT%%=*}"; else case "${PKG_FNAME:-}" in @@ -72,8 +72,8 @@ exp_pkg_env_set() { _eppes_lvars="" _eppes_var_prefixes="" _eppes_vars_set="" \ _eppes_vars_unset="" _eppes_vname="" _eppes_vnames="" IFS IFS0; - rtl_set_vars _eppes_vars_set BUILD_TYPE "DEFAULT ${_eppes_group_name} PKG_${_eppes_pkg_name}"; - rtl_set_vars _eppes_vars_set INHERIT_FROM "PKG_${_eppes_pkg_name}"; + rtl_set_var _eppes_vars_set BUILD_TYPE "DEFAULT ${_eppes_group_name} PKG_${_eppes_pkg_name}"; + rtl_set_var _eppes_vars_set INHERIT_FROM "PKG_${_eppes_pkg_name}"; _eppes_var_prefixes="DEFAULT DEFAULT_${PKG_BUILD_TYPE} ${_eppes_group_name}"; rtl_toupper \$_eppes_var_prefixes; rtl_lfilter2 \$_eppes_build_vars_default \$_eppes_vnames BUILD_TYPE; @@ -83,12 +83,12 @@ exp_pkg_env_set() { _eppes_lvars="PKG_${PKG_INHERIT_FROM} PKG_${PKG_INHERIT_FROM}_${BUILD_KIND} PKG_${_eppes_pkg_name} PKG_${_eppes_pkg_name}_${BUILD_KIND}"; rtl_toupper \$_eppes_lvars; rtl_lconcat2 \$_eppes_lvars \$_eppes_var_prefixes "${_eppes_lvars}"; - rtl_set_vars _eppes_vars_set "${_eppes_vname}" "${_eppes_lvars}"; + rtl_set_var _eppes_vars_set "${_eppes_vname}" "${_eppes_lvars}"; else _eppes_lvars="PKG_${_eppes_pkg_name} PKG_${_eppes_pkg_name}_${BUILD_KIND}"; rtl_toupper \$_eppes_lvars; rtl_lconcat2 \$_eppes_lvars \$_eppes_var_prefixes "${_eppes_lvars}"; - rtl_set_vars _eppes_vars_set "${_eppes_vname}" "${_eppes_lvars}"; + rtl_set_var _eppes_vars_set "${_eppes_vname}" "${_eppes_lvars}"; fi; done; -- cgit v1.2.3