From 9cd633ace6e76a7f2d5613be9d0dff8a1f5e2fce Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 13 Jun 2025 18:14:35 -1000 Subject: [PATCH] ;tools:checkembeddedfiles: use standard unix tools rg isn't in github images --- tools/checkembeddedfiles | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/checkembeddedfiles b/tools/checkembeddedfiles index 8c408ea7c..40556beb7 100755 --- a/tools/checkembeddedfiles +++ b/tools/checkembeddedfiles @@ -2,13 +2,11 @@ # Check that all files embedded with file-embed are declared in extra-source-files set -e -rg="rg --sort=path" -$rg --version >/dev/null echo "Checking embedded file declarations:" status=0 -for f in $($rg -I '\$\(embedFile[^ ]* "([^"]+)"' -or '$1'); do - if output=$($rg -l "$f" -- */package.yaml); then +for f in $(find . -name '*.hs' | xargs grep -E '\$\(embedFile' | sed -E 's/.*\$\(embedFile[^ ]* "([^"]+)".*/\1/'); do + if output=$(grep -l "$f" -- */package.yaml); then printf '%-40s\tdeclared in %s\n' "$f" "$output" else printf '%-40s\tUNDECLARED\n' "$f"