From ff178a925edd48abefecd1a3e22430aaaa35e434 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Wed, 6 Aug 2025 15:04:03 -0400 Subject: [PATCH] scripts: Also diff .inl files in meld-all and suppress diff error message Signed-off-by: Stefan Berger --- scripts/meld-all | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/meld-all b/scripts/meld-all index 4ce1a032..3aae682b 100755 --- a/scripts/meld-all +++ b/scripts/meld-all @@ -20,7 +20,7 @@ main() while :; do case "$1" in - --no-meld|diff-only) + --no-meld|--diff-only) flags=$((flags | NO_MELD_FLAG)) shift ;; @@ -55,7 +55,9 @@ main() exit 1 fi - for f in $(find "$1" -type f -name '*.[ch]'); do + for f in \ + $(find "$1" -type f -name '*.[ch]') \ + $(find "$1" -type f -name '*.inl'); do fname=$(basename "$f") if [[ "${fname}" =~ ^${SKIP_FILES}$ ]]; then @@ -81,7 +83,7 @@ main() echo "${f}" diff --ignore-trailing-space <(sed -n "${line},\$p" < "${f}") "${upstream}" fi - if ! diff --ignore-trailing-space <(sed -n "${line},\$p" < "${f}") "${upstream}" >/dev/null; then + if ! diff --ignore-trailing-space <(sed -n "${line},\$p" < "${f}") "${upstream}" &>/dev/null; then if [ $((flags & NO_MELD_FLAG)) -eq 0 ]; then meld "${upstream}" "$f" fi