diff --git a/sh/main.sh b/sh/main.sh index ebd8849..ed2949a 100755 --- a/sh/main.sh +++ b/sh/main.sh @@ -79,11 +79,12 @@ _rwx_main_log() { # source code from root path rwx_main_source() { local root="${1}" + local main="${2}" [ -d "${root}" ] || return 1 local module modules - _rwx_main_log "" \ - ". ${root}" + # cache main + [ -n "${main}" ] && rwx_main_cache "${RWX_ROOT_SYSTEM}" "${RWX_MAIN_NAME}" modules="$(rwx_main_find "${root}")" while IFS= read -r module; do if [ "${module}" != "${RWX_MAIN_NAME}" ]; then @@ -124,10 +125,8 @@ ${text} # run initial steps #< core/code rwx_main_main() { - # cache main - rwx_main_cache "${RWX_ROOT_SYSTEM}" "${RWX_MAIN_NAME}" # source system root - if ! rwx_main_source "${RWX_ROOT_SYSTEM}"; then + if ! rwx_main_source "${RWX_ROOT_SYSTEM}" "${RWX_MAIN_NAME}"; then _rwx_main_log "Not a directory: ${RWX_ROOT_SYSTEM}" return 1 fi