From 225dd1380b9857b5cb5f618f99854632e4a27275 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 9 Jul 2025 16:35:11 +0200 Subject: [PATCH] main/root --- sh/core/code.sh | 14 +++++++------- sh/main.sh | 7 +++---- sh/self.sh | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/sh/core/code.sh b/sh/core/code.sh index fd943bc..198112d 100644 --- a/sh/core/code.sh +++ b/sh/core/code.sh @@ -8,14 +8,14 @@ # TODO variablize # path to the entrypoint main file of the project -RWX_MAIN_PATH="${RWX_ROOT_SYSTEM}/${RWX_MAIN_MODULE}.${RWX_MAIN_EXTENSION}" +RWX_MAIN_PATH="${rwx_main_root}/${RWX_MAIN_MODULE}.${RWX_MAIN_EXTENSION}" # user root directory of the project RWX_SELF_USER="${HOME}/${RWX_MAIN_NAME}" # cache of all sourced code modules _rwx_code="" # cache for the parsing awk script -_rwx_code_awk="$(cat "${RWX_ROOT_SYSTEM}/core/code.awk")" +_rwx_code_awk="$(cat "${rwx_main_root}/core/code.awk")" # cache for code aliases _rwx_code_aliases="" # cache for code aliases functions @@ -55,9 +55,9 @@ rwx_code_install() { local command file name root # code if [ -n "${target}" ]; then - root="${target}${RWX_ROOT_SYSTEM}" + root="${target}${rwx_main_root}" rwx_remove "${root}" - cp --recursive "${RWX_ROOT_SYSTEM}" "${root}" + cp --recursive "${rwx_main_root}" "${root}" fi # commands root="${target}/usr/local/bin" @@ -164,10 +164,10 @@ rwx_code_variables() { rwx_code_check() { # check format rwx_log - rwx_shfmt "${RWX_ROOT_SYSTEM}" + rwx_shfmt "${rwx_main_root}" # check syntax rwx_log - rwx_shellcheck "${RWX_ROOT_SYSTEM}" + rwx_shellcheck "${rwx_main_root}" } # fetch matching doc for given name @@ -239,7 +239,7 @@ EOF while IFS= read -r module; do # cache main module _rwx_code="${_rwx_code}#. ${module} -$(cat "${RWX_ROOT_SYSTEM}/${module}.${RWX_MAIN_EXTENSION}") +$(cat "${rwx_main_root}/${module}.${RWX_MAIN_EXTENSION}") " done <