diff --git a/sh/core/code.sh b/sh/core/code.sh index 39675ca..a4a5eb0 100644 --- a/sh/core/code.sh +++ b/sh/core/code.sh @@ -223,9 +223,6 @@ rwx_code_parse() { # ╰──────┴──────╯ rwx_code_main() { - local code="${1}" - shift - _rwx_code="${code}" # source user root rwx_main_source "${RWX_SELF_USER}" # load code cache diff --git a/sh/main.sh b/sh/main.sh index 288b2f8..401fccd 100755 --- a/sh/main.sh +++ b/sh/main.sh @@ -79,15 +79,17 @@ _rwx_main_log() { # source code from root path rwx_main_source() { local root="${1}" - local main="${2}" [ -d "${root}" ] || return 1 - local module modules - # cache main - [ -n "${main}" ] && rwx_main_cache "${root}" "${main}" + local count module modules + count=0 + _rwx_main_log "" \ + ". ${root}" modules="$(rwx_main_find "${root}")" while IFS= read -r module; do - if [ "${module}" != "${main}" ]; then + if [ "${module}" != "${RWX_MAIN_NAME}" ]; then + count=$((count + 1)) + _rwx_main_log "$(printf "%02d" "${count}") ${module}" # shellcheck disable=SC1090 . "${root}/${module}.${RWX_MAIN_EXTENSION}" # cache code @@ -125,15 +127,15 @@ ${text} # run initial steps #< core/code rwx_main_main() { - local code + # cache main + rwx_main_cache "${RWX_ROOT_SYSTEM}" "${RWX_MAIN_NAME}" # source system root - if ! rwx_main_source "${RWX_ROOT_SYSTEM}" "${RWX_MAIN_NAME}"; then + if ! rwx_main_source "${RWX_ROOT_SYSTEM}"; then _rwx_main_log "Not a directory: ${RWX_ROOT_SYSTEM}" return 1 fi - code="${_rwx_code}" # run code main function - rwx_code_main "${code}" "${@}" + rwx_code_main "${@}" } # run main function