From 54ab72488f90b31b287b46fb94c9c7fa5c70876e Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 21:06:39 +0200 Subject: [PATCH 1/8] log/simplify --- sh/log/log.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/sh/log/log.sh b/sh/log/log.sh index eddf92c..f2a6b19 100644 --- a/sh/log/log.sh +++ b/sh/log/log.sh @@ -71,24 +71,14 @@ rwx_log_warn() { # TODO simplify -_rwx_main_log() { - [ ${#} -gt 0 ] || set -- "" - local line - for line in "${@}"; do - echo "${line}" - done -} - _rwx_log() { local prefix="${1}" shift [ ${#} -gt 0 ] || set -- "" local line for line in "${@}"; do - if [ -n "${prefix}" ]; then - _rwx_main_log "${prefix} ${line}" - else - _rwx_main_log "${line}" - fi + [ -n "${prefix}" ] && + printf "%s" "${prefix} " + echo "${line}" done } From dd077b89f34c8d3739b7fd935a41eede6feb601a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 21:54:25 +0200 Subject: [PATCH 2/8] log/[] --- sh/log/log.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sh/log/log.sh b/sh/log/log.sh index f2a6b19..1fd578e 100644 --- a/sh/log/log.sh +++ b/sh/log/log.sh @@ -27,7 +27,7 @@ rwx_log() { rwx_log_info "${@}"; } rwx_log_debug() { if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_DEBUG}" ]; then - _rwx_log "[DEBUG]" "${@}" + _rwx_log "DEBUG" "${@}" fi } @@ -36,7 +36,7 @@ rwx_log_error() { shift [ -n "${code}" ] || rwx_log_fatal 1 "No error code" if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_ERROR}" ]; then - _rwx_log "[ERROR]" "${@}" >&2 + _rwx_log "ERROR" "${@}" >&2 return "${code}" fi } @@ -46,7 +46,7 @@ rwx_log_fatal() { shift [ -n "${code}" ] || rwx_log_fatal 1 "No error code" if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_FATAL}" ]; then - _rwx_log "[FATAL]" "${@}" >&2 + _rwx_log "FATAL" "${@}" >&2 exit "${code}" fi } @@ -59,13 +59,13 @@ rwx_log_info() { rwx_log_trace() { if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_TRACE}" ]; then - _rwx_log "[TRACE]" "${@}" + _rwx_log "TRACE" "${@}" fi } rwx_log_warn() { if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_WARN}" ]; then - _rwx_log "[ WARN]" "${@}" + _rwx_log " WARN" "${@}" fi } @@ -78,7 +78,7 @@ _rwx_log() { local line for line in "${@}"; do [ -n "${prefix}" ] && - printf "%s" "${prefix} " + printf "%s" "[${prefix}] " echo "${line}" done } From aced0a1fb30e90d9cd2add3b266b8ffa905ab449 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 21:58:23 +0200 Subject: [PATCH 3/8] log/alias --- sh/log/log.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sh/log/log.sh b/sh/log/log.sh index 1fd578e..783c5a0 100644 --- a/sh/log/log.sh +++ b/sh/log/log.sh @@ -23,8 +23,6 @@ RWX_LOG_LEVEL=${RWX_LOG_LEVEL_INFO} # │ log │ log │ # ╰─────┴─────╯ -rwx_log() { rwx_log_info "${@}"; } - rwx_log_debug() { if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_DEBUG}" ]; then _rwx_log "DEBUG" "${@}" @@ -51,6 +49,7 @@ rwx_log_fatal() { fi } +#= rwx_log rwx_log_info() { if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_INFO}" ]; then _rwx_log "" "${@}" From 9a2603c6dec98693b6d4106d1c07fd40e4258e83 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 22:03:54 +0200 Subject: [PATCH 4/8] log/level --- sh/log/log.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sh/log/log.sh b/sh/log/log.sh index 783c5a0..79b242b 100644 --- a/sh/log/log.sh +++ b/sh/log/log.sh @@ -17,14 +17,14 @@ RWX_LOG_LEVEL_TRACE=5 # │ log │ variables │ # ╰─────┴───────────╯ -RWX_LOG_LEVEL=${RWX_LOG_LEVEL_INFO} +rwx_log_level=${RWX_LOG_LEVEL_INFO} # ╭─────┬─────╮ # │ log │ log │ # ╰─────┴─────╯ rwx_log_debug() { - if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_DEBUG}" ]; then + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_DEBUG}" ]; then _rwx_log "DEBUG" "${@}" fi } @@ -33,7 +33,7 @@ rwx_log_error() { local code="${1}" shift [ -n "${code}" ] || rwx_log_fatal 1 "No error code" - if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_ERROR}" ]; then + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_ERROR}" ]; then _rwx_log "ERROR" "${@}" >&2 return "${code}" fi @@ -43,7 +43,7 @@ rwx_log_fatal() { local code="${1}" shift [ -n "${code}" ] || rwx_log_fatal 1 "No error code" - if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_FATAL}" ]; then + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_FATAL}" ]; then _rwx_log "FATAL" "${@}" >&2 exit "${code}" fi @@ -51,25 +51,23 @@ rwx_log_fatal() { #= rwx_log rwx_log_info() { - if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_INFO}" ]; then + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_INFO}" ]; then _rwx_log "" "${@}" fi } rwx_log_trace() { - if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_TRACE}" ]; then + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_TRACE}" ]; then _rwx_log "TRACE" "${@}" fi } rwx_log_warn() { - if [ "${RWX_LOG_LEVEL}" -ge "${RWX_LOG_LEVEL_WARN}" ]; then + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_WARN}" ]; then _rwx_log " WARN" "${@}" fi } -# TODO simplify - _rwx_log() { local prefix="${1}" shift From ef4879efd7dce21d24d8e56b7710baf8d926b0e4 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 22:05:47 +0200 Subject: [PATCH 5/8] log/log --- sh/log/log.sh | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sh/log/log.sh b/sh/log/log.sh index 79b242b..07e5907 100644 --- a/sh/log/log.sh +++ b/sh/log/log.sh @@ -19,9 +19,21 @@ RWX_LOG_LEVEL_TRACE=5 rwx_log_level=${RWX_LOG_LEVEL_INFO} -# ╭─────┬─────╮ -# │ log │ log │ -# ╰─────┴─────╯ +# ╭─────┬───────────╮ +# │ log │ functions │ +# ╰─────┴───────────╯ + +_rwx_log() { + local prefix="${1}" + shift + [ ${#} -gt 0 ] || set -- "" + local line + for line in "${@}"; do + [ -n "${prefix}" ] && + printf "%s" "[${prefix}] " + echo "${line}" + done +} rwx_log_debug() { if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_DEBUG}" ]; then @@ -67,15 +79,3 @@ rwx_log_warn() { _rwx_log " WARN" "${@}" fi } - -_rwx_log() { - local prefix="${1}" - shift - [ ${#} -gt 0 ] || set -- "" - local line - for line in "${@}"; do - [ -n "${prefix}" ] && - printf "%s" "[${prefix}] " - echo "${line}" - done -} From a09a9f2a03fff8dd4a1ff4559b15ea9877ee1483 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 22:08:05 +0200 Subject: [PATCH 6/8] =?UTF-8?q?log/=E2=86=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sh/log/log.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sh/log/log.sh b/sh/log/log.sh index 07e5907..3921b8a 100644 --- a/sh/log/log.sh +++ b/sh/log/log.sh @@ -35,9 +35,13 @@ _rwx_log() { done } -rwx_log_debug() { - if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_DEBUG}" ]; then - _rwx_log "DEBUG" "${@}" +rwx_log_fatal() { + local code="${1}" + shift + [ -n "${code}" ] || rwx_log_fatal 1 "No error code" + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_FATAL}" ]; then + _rwx_log "FATAL" "${@}" >&2 + exit "${code}" fi } @@ -51,13 +55,9 @@ rwx_log_error() { fi } -rwx_log_fatal() { - local code="${1}" - shift - [ -n "${code}" ] || rwx_log_fatal 1 "No error code" - if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_FATAL}" ]; then - _rwx_log "FATAL" "${@}" >&2 - exit "${code}" +rwx_log_warn() { + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_WARN}" ]; then + _rwx_log " WARN" "${@}" fi } @@ -68,14 +68,14 @@ rwx_log_info() { fi } +rwx_log_debug() { + if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_DEBUG}" ]; then + _rwx_log "DEBUG" "${@}" + fi +} + rwx_log_trace() { if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_TRACE}" ]; then _rwx_log "TRACE" "${@}" fi } - -rwx_log_warn() { - if [ "${rwx_log_level}" -ge "${RWX_LOG_LEVEL_WARN}" ]; then - _rwx_log " WARN" "${@}" - fi -} From 289ee65a988dff5fd9fcea47cb4ce337de53d2f5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 23:07:26 +0200 Subject: [PATCH 7/8] =?UTF-8?q?=E2=88=92useless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sh/main.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/sh/main.sh b/sh/main.sh index d6cc20c..856240f 100755 --- a/sh/main.sh +++ b/sh/main.sh @@ -2,7 +2,6 @@ # ╭──────╮ # │ main │ # ╰──────╯ -# main module # ╭──────┬───────────╮ # │ main │ constants │ From 7a8915682d3333a6a04215669346ae87bd9d355c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 23:12:57 +0200 Subject: [PATCH 8/8] main/comments --- sh/main.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/sh/main.sh b/sh/main.sh index 856240f..2039ba5 100755 --- a/sh/main.sh +++ b/sh/main.sh @@ -7,27 +7,27 @@ # │ main │ constants │ # ╰──────┴───────────╯ -# parent directory for the project +# project parent directory RWX_MAIN_PARENT="/usr/local/lib" -# name of the project itself +# project name RWX_MAIN_NAME="rwx" -# name of the entrypoint module +# project entrypoint module RWX_MAIN_MODULE="main" -# extension of shell modules +# shell modules extension RWX_MAIN_EXTENSION="sh" # ╭──────┬───────────╮ # │ main │ variables │ # ╰──────┴───────────╯ -# system root directory of the project +# project main root directory rwx_main_root="${RWX_MAIN_PARENT}/${RWX_MAIN_NAME}" # ╭──────┬──────╮ # │ main │ find │ # ╰──────┴──────╯ -# find directory’s shell files +# find root directory shell modules #| find #| sed #| sort @@ -46,13 +46,16 @@ rwx_main_find() { # │ main │ main │ # ╰──────┴──────╯ -# run initial steps +# run required initial steps #< core/code rwx_main_main() { - local module modules - # find & source modules + local module + local modules + # find main modules modules="$(rwx_main_find "${rwx_main_root}")" + # source main modules while IFS= read -r module; do + # except currently running main module if [ "${module}" != "${RWX_MAIN_MODULE}" ]; then # shellcheck disable=SC1090 . "${rwx_main_root}/${module}.${RWX_MAIN_EXTENSION}" @@ -60,7 +63,7 @@ rwx_main_main() { done <