From 52593c95715cf289a75b9c1b78bba56c7fdb57b9 Mon Sep 17 00:00:00 2001
From: Marc Beninca <git@marc.beninca.link>
Date: Sun, 27 Jul 2025 13:00:04 +0200
Subject: [PATCH] find with extension

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

diff --git a/sh/core/code.sh b/sh/core/code.sh
index a9bea2c..c71a509 100644
--- a/sh/core/code.sh
+++ b/sh/core/code.sh
@@ -289,10 +289,10 @@ rwx_code_main() {
 	# find user modules
 	rwx_code_modules_user="$(rwx_main_find "${rwx_code_root}")"
 	# source user modules
-	[ "${rwx_code_modules_user}" ] &&
+	[ -n "${rwx_code_modules_user}" ] &&
 		while IFS= read -r module; do
 			# shellcheck disable=SC1090
-			. "${rwx_code_root}/${module}.${RWX_MAIN_EXTENSION}"
+			. "${rwx_code_root}/${module}"
 		done <<EOF
 ${rwx_code_modules_user}
 EOF
diff --git a/sh/lint/shellcheck.sh b/sh/lint/shellcheck.sh
index 75101f2..c6aabb6 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}.${RWX_MAIN_EXTENSION}"
+		path="${root}/${module}"
 		echo ". \"${path}\"" >>"${file}"
 	done <<EOF
 ${modules}
diff --git a/sh/main.sh b/sh/main.sh
index cf55797..078d5be 100755
--- a/sh/main.sh
+++ b/sh/main.sh
@@ -35,7 +35,6 @@ rwx_main_path="${rwx_main_root}/${rwx_main_file}"
 # FIXME separate in two functions
 # find root directory shell modules
 #| find
-#| sed
 #| sort
 rwx_main_find() {
 	local root="${1}"
@@ -45,7 +44,6 @@ rwx_main_find() {
 			-name "*.${RWX_MAIN_EXTENSION}" \
 			-type "f" \
 			-printf "%P\n" |
-			sed "s|\\.[^.]*\$||" |
 			sort
 }
 
@@ -66,7 +64,7 @@ rwx_main_main() {
 		# except currently running main module
 		if [ "${module}" != "${RWX_MAIN_MODULE}" ]; then
 			# shellcheck disable=SC1090
-			. "${rwx_main_root}/${module}.${RWX_MAIN_EXTENSION}"
+			. "${rwx_main_root}/${module}"
 		fi
 	done <<EOF
 ${modules}
diff --git a/sh/self.sh b/sh/self.sh
index d399c0d..757b8a5 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}.${RWX_MAIN_EXTENSION}"
+				echo "${argument}/${file}"
 			done
 		elif [ -f "${rwx_main_root}/${file}" ]; then
 			echo "${file}"