From 2fc37b4b47cc55d86f611d96c6798912441b0eae Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Mon, 14 Sep 2026 08:48:16 +0100 Subject: [PATCH] use -mindepth alongside -maxdepth in find use of maxdepth 1 does not exclude the main directory, which is undesired in these contexts, though excluded in practise due to how find is actually used. technically, mindepth should be used, just in case, as a defensive measure. the context here is files and directories within a main directory, used as arguments in other commands. Signed-off-by: Leah Rowe --- include/fw/inject.sh | 3 ++- include/fw/vendor.sh | 3 ++- include/mk/release.sh | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/fw/inject.sh b/include/fw/inject.sh index 0760c1d8..29584e0a 100644 --- a/include/fw/inject.sh +++ b/include/fw/inject.sh @@ -175,7 +175,8 @@ modify_mac() x_ "$nvmutil" "$xbtmp/gbe" setmac "$new_mac" fi - fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" + fx_ newmac x_ find "$tmpromdir" -mindepth 1 -maxdepth 1 \ + -type f -name "*.rom" printf "\nThe following GbE NVM data will be written:\n" x_ "$nvmutil" "$xbtmp/gbe" dump | grep -v "bytes read from file" || : diff --git a/include/fw/vendor.sh b/include/fw/vendor.sh index 10daeca3..7c8f9f2c 100644 --- a/include/fw/vendor.sh +++ b/include/fw/vendor.sh @@ -436,7 +436,8 @@ getvfile() else # inject vendor files - fx_ prep x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" + fx_ prep x_ find "$tmpromdir" -mindepth 1 -maxdepth 1 \ + -type f -name "*.rom" ( check_vendor_hashes ) || \ err "$archive: Can't verify hashes" "getvfile" "$@"; : fi diff --git a/include/mk/release.sh b/include/mk/release.sh index f0dc4864..e713ae64 100644 --- a/include/mk/release.sh +++ b/include/mk/release.sh @@ -109,7 +109,8 @@ prep_release_bin() x_ ./mk -b stm32-vserprog x_ ./mk -b pcsx-redux - fx_ mkrom_tarball x_ find bin -maxdepth 1 -type d -name "serprog_*" + fx_ mkrom_tarball x_ find bin -mindepth 1 -maxdepth 1 \ + -type d -name "serprog_*" x_ mv bin ../roms }