From e060c189498cb86282fdf1b705531baf998bb86a Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Wed, 9 Jul 2025 02:04:14 +0200
Subject: [PATCH] simplify

---
 sh/core/code.sh       |  2 +-
 sh/lint/shellcheck.sh |  2 +-
 sh/main.sh            | 42 ++++++++++++++++++++----------------------
 sh/self.sh            |  2 +-
 4 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/sh/core/code.sh b/sh/core/code.sh
index 393e5d5..18860ab 100644
--- a/sh/core/code.sh
+++ b/sh/core/code.sh
@@ -8,7 +8,7 @@
 
 # TODO variablize
 # path to the entrypoint main file of the project
-RWX_MAIN_PATH="${RWX_ROOT_SYSTEM}/${RWX_MAIN_NAME}"
+RWX_MAIN_PATH="${RWX_ROOT_SYSTEM}/${RWX_MAIN_NAME}.sh"
 # user root directory of the project
 RWX_SELF_USER="${HOME}/${RWX_SELF_NAME}"
 
diff --git a/sh/lint/shellcheck.sh b/sh/lint/shellcheck.sh
index c6aabb6..3bdfa07 100644
--- a/sh/lint/shellcheck.sh
+++ b/sh/lint/shellcheck.sh
@@ -4,7 +4,7 @@ rwx_shellcheck() {
 	file="$(mktemp)"
 	modules="$(rwx_main_find "${root}")"
 	while IFS= read -r module; do
-		path="${root}/${module}"
+		path="${root}/${module}.sh"
 		echo ". \"${path}\"" >>"${file}"
 	done <<EOF
 ${modules}
diff --git a/sh/main.sh b/sh/main.sh
index 4910ba8..297cdbb 100755
--- a/sh/main.sh
+++ b/sh/main.sh
@@ -8,8 +8,8 @@
 # │ main │ constants │
 # ╰──────┴───────────╯
 
-# name of the entrypoint file
-RWX_MAIN_NAME="main.sh"
+# name of the entrypoint module
+RWX_MAIN_NAME="main"
 # name of the project itself
 RWX_SELF_NAME="rwx"
 
@@ -30,21 +30,18 @@ RWX_ROOT_SYSTEM="/usr/local/lib/${RWX_SELF_NAME}"
 
 # find directory’s shell files
 #| find
+#| sed
 #| sort
 rwx_main_find() {
 	local root="${1}"
 	local file="${2}"
-	set -- \
+	find \
 		"${root}" \
 		-name "*.sh" \
-		-type "f"
-	[ -n "${file}" ] &&
-		set -- "${@}" \
-			-not \
-			-name "${file}"
-	find "${@}" \
+		-type "f" \
 		-printf "%P\n" |
-		sort
+			sed "s|\\.[^.]*\$||" |
+				sort
 }
 
 # ╭──────┬───────╮
@@ -77,24 +74,25 @@ _rwx_main_log() {
 # │ main │ source │
 # ╰──────┴────────╯
 
-# source code from root path but file
+# source code from root path
 rwx_main_source() {
 	local root="${1}"
 	[ -d "${root}" ] ||
 		return 1
-	local file="${2}"
 	local count module modules
 	count=0
 	_rwx_main_log "" \
 		". ${root}"
-	modules="$(rwx_main_find "${root}" "${file}")"
+	modules="$(rwx_main_find "${root}")"
 	while IFS= read -r module; do
-		count=$((count + 1))
-		_rwx_main_log "$(printf "%02d" "${count}") ${module%.sh}"
-		# shellcheck disable=SC1090
-		. "${root}/${module}"
-		# cache code
-		rwx_main_cache "${root}" "${module}"
+		if [ "${module}" != "${RWX_MAIN_NAME}" ]; then
+			count=$((count + 1))
+			_rwx_main_log "$(printf "%02d" "${count}") ${module}"
+			# shellcheck disable=SC1090
+			. "${root}/${module}.sh"
+			# cache code
+			rwx_main_cache "${root}" "${module}"
+		fi
 	done <<EOF
 ${modules}
 EOF
@@ -110,8 +108,8 @@ EOF
 rwx_main_cache() {
 	local root="${1}"
 	local module="${2}"
-	local name="${module%.sh}"
-	local path="${root}/${module}"
+	local name="${module}"
+	local path="${root}/${module}.sh"
 	local text
 	text="$(cat "${path}")"
 	# all source code
@@ -131,7 +129,7 @@ rwx_main_main() {
 	# 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
diff --git a/sh/self.sh b/sh/self.sh
index a8a6dbf..4b25c38 100644
--- a/sh/self.sh
+++ b/sh/self.sh
@@ -15,7 +15,7 @@ rwx_self_subset() {
 		if [ -d "${root}" ]; then
 			local file
 			for file in $(rwx_main_find "${root}"); do
-				echo "${argument}/${file}"
+				echo "${argument}/${file}.sh"
 			done
 		elif [ -f "${RWX_ROOT_SYSTEM}/${file}" ]; then
 			echo "${file}"