This commit is contained in:
Marc Beninca 2024-11-29 18:46:52 +01:00
parent 1e5451f059
commit 32b5389786
Signed by: marc.beninca
GPG key ID: 9C7613450C80C24F

View file

@ -31,7 +31,7 @@ _sh_ifs_pop() {
unset SH_IFS unset SH_IFS
} }
_sh_main_log() { _rwx_main_log() {
if sh_shell_interactive; then if sh_shell_interactive; then
[ ${#} -gt 0 ] || set -- "" [ ${#} -gt 0 ] || set -- ""
local line local line
@ -99,11 +99,11 @@ rwx_main_source() {
modules="$(sh_find_sh "${path}" "${SH_MAIN_NAME}")" modules="$(sh_find_sh "${path}" "${SH_MAIN_NAME}")"
_sh_ifs_new _sh_ifs_new
count=0 count=0
_sh_main_log "" \ _rwx_main_log "" \
". ${path}" ". ${path}"
for module in ${modules}; do for module in ${modules}; do
count=$((count + 1)) count=$((count + 1))
_sh_main_log "$(printf "%02d" "${count}") ${module%.sh}" _rwx_main_log "$(printf "%02d" "${count}") ${module%.sh}"
module="${path}/${module}" module="${path}/${module}"
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "${module}" . "${module}"
@ -125,7 +125,7 @@ rwx_main_source() {
rwx_main() { rwx_main() {
# system root # system root
if ! rwx_main_source "${SH_ROOT}"; then if ! rwx_main_source "${SH_ROOT}"; then
_sh_main_log "Not a directory: ${SH_ROOT}" _rwx_main_log "Not a directory: ${SH_ROOT}"
return 1 return 1
fi fi
# user root # user root