From 7bbda90e2c18333934e0da810c0fa95409634edf Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 2 Jun 2023 11:08:40 -1000 Subject: [PATCH] ;dev:tools:checkembeddedfiles: fail when rg is not installed --- tools/checkembeddedfiles | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/checkembeddedfiles b/tools/checkembeddedfiles index 8fd9a32e1..1f63f3dd8 100755 --- a/tools/checkembeddedfiles +++ b/tools/checkembeddedfiles @@ -2,11 +2,15 @@ # 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:" -mapfile -t embeddedfiles < <(rg --sort=path '^ +\$\(embedFileRelative "([^"]+)"' -or '$1' -I) +# shellcheck disable=SC2016 +mapfile -t embeddedfiles < <($rg -I '^ +\$\(embedFileRelative "([^"]+)"' -or '$1') status=0 for f in "${embeddedfiles[@]}"; do - if output=$(rg --sort=path -l "$f" -- */package.yaml); then + if output=$($rg -l "$f" -- */package.yaml); then printf '%-40s\tdeclared in %s\n' "$f" "$output" else printf '%-40s\tUNDECLARED\n' "$f"