diff options
| -rw-r--r-- | etc/README | 2 | ||||
| -rw-r--r-- | etc/build.usage | 2 | ||||
| -rw-r--r-- | subr/ex_rtl_log.subr | 16 |
3 files changed, 5 insertions, 15 deletions
@@ -9,7 +9,7 @@ A Midipix distribution consists of the following: executive subsystems of all Windows NT-derived Windows OS starting with and including Windows XP, and * a steadily increasing number of 3rd party open source packages, as expected in - any modern POSIX-compliant *nix environment, including GNU coreutils, shells, + any modern POSIX-compliant \*nix environment, including GNU coreutils, shells, libraries such as ncurses, libressl, as well as Perl and Python. Compressed Midipix distribution tarballs and, separately, source tarballs are, diff --git a/etc/build.usage b/etc/build.usage index ceefcb3c..ed54f300 100644 --- a/etc/build.usage +++ b/etc/build.usage @@ -20,7 +20,7 @@ usage: ./build.sh [-4|6] [-a nt32|nt64] [-b debug|release] [-c] [-C dir[,..]] If -R is not specified and at least one (1) package fails to build, all remaining package builds will be forcibly aborted for convenience. -r ALL[:step,..] - -r name[,..][:step,..] Restart the all packages/the specified comma-separated package(s) + -r name[,..][:step,..] Restart all packages/the specified comma-separated package(s) completely or at optionally specified comma-separated step(s). Currently defined steps are: fetch_wget, fetch_git, fetch_extract, diff --git a/subr/ex_rtl_log.subr b/subr/ex_rtl_log.subr index 108e90ab..e7d9ef3d 100644 --- a/subr/ex_rtl_log.subr +++ b/subr/ex_rtl_log.subr @@ -33,7 +33,7 @@ ex_rtl_log_set_vnfo_lvl() { }; ex_rtl_log_msg() { - local _lvl="${1}" _attr=""; shift; + local _lvl="${1}" _lvl_uc="" _attr=""; shift; if [ "${_lvl}" = vnfo ]\ || [ "${_lvl}" = vucc ]\ && [ "${EXP_RTL_LOG_VNFO_LVL:-0}" -lt 1 ]; then @@ -45,18 +45,8 @@ ex_rtl_log_msg() { && [ "${EXP_RTL_LOG_VNFO_LVL:-0}" -lt 3 ]; then return; fi; - case "${_lvl}" in - failexit) _attr="${DEFAULT_LOG_MSG_FAIL_COLOUR}"; ;; - fail) _attr="${DEFAULT_LOG_MSG_FAIL_COLOUR}"; ;; - info) _attr="${DEFAULT_LOG_MSG_INFO_COLOUR}"; ;; - inf2) _attr="${DEFAULT_LOG_MSG_INF2_COLOUR}"; ;; - vnfo) _attr="${DEFAULT_LOG_MSG_VNFO_COLOUR}"; ;; - vvfo) _attr="${DEFAULT_LOG_MSG_VVFO_COLOUR}"; ;; - vvvo) _attr="${DEFAULT_LOG_MSG_VVVO_COLOUR}"; ;; - succ) _attr="${DEFAULT_LOG_MSG_SUCC_COLOUR}"; ;; - suc2) _attr="${DEFAULT_LOG_MSG_SUC2_COLOUR}"; ;; - vucc) _attr="${DEFAULT_LOG_MSG_VUCC_COLOUR}"; ;; - esac; + _lvl_uc="$(ex_rtl_toupper "${_lvl%exit}")"; + _attr="$(ex_rtl_get_var_unsafe "DEFAULT_LOG_MSG_${_lvl_uc}_COLOUR")"; if [ ${#} -gt 1 ]; then exp_rtl_log_printf "${_attrs}" "==> %s %s %s" "$(ex_rtl_date)" "${1}" "$*"; else |