From 15d67f0da2083c0a39964f8fc6bdcbbd4907b2ed Mon Sep 17 00:00:00 2001 From: sideshowbarker Date: Tue, 16 Jul 2024 18:51:33 +0900 Subject: [PATCH] Meta: Make check-debug-flags.sh runnable in Bash 3.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change updates the Meta/check-debug-flags.sh script to avoid an apparent Bach 3.2 parser bug. Specifically, it takes a comment and some code of a process substitution and moves it into a separate function. Otherwise, without this change, trying to run the check-debug-flags.sh script with Bash 3.2 fails with the following error: line 39: bad substitution: no closing `)' in <( ...apparently because Bash 3.2 chokes on the comment (and doesn’t choke if the comment is completely removed). Relates to https://github.com/LadybirdBrowser/ladybird/issues/283 --- Meta/check-debug-flags.sh | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/Meta/check-debug-flags.sh b/Meta/check-debug-flags.sh index 059046ab0da..96668670394 100755 --- a/Meta/check-debug-flags.sh +++ b/Meta/check-debug-flags.sh @@ -7,6 +7,23 @@ cd "${script_path}/.." MISSING_FLAGS=n +find_all_source_files () { + # We're in the middle of a pre-commit run, so we should only check the files that have + # actually changed. The reason is that "git ls-files | grep" on the entire repo takes + # about 100ms. That is perfectly fine during a CI run, but becomes noticeable during a + # pre-commit hook. It is unnecessary to check the entire repository on every single + # commit, so we save some time here. + # + # And see https://github.com/LadybirdBrowser/ladybird/issues/283; the reason this is + # pulled out into separate function is, Bash 3.2 apparently has a parser bug which + # makes it choke on the above comment if it's in the process substitution below. + for file in "$@"; do + if [[ ("${file}" =~ \.cpp || "${file}" =~ \.h || "${file}" =~ \.in) ]]; then + echo "$file" + fi + done +} + # Check whether all_the_debug_macros.cmake sets all the flags used in C++ code. while IFS= read -r FLAG; do # We intentionally don't check for commented-out lines, @@ -22,16 +39,7 @@ done < <( '*.h' \ '*.in' else - # We're in the middle of a pre-commit run, so we should only check the files that have - # actually changed. The reason is that "git ls-files | grep" on the entire repo takes - # about 100ms. That is perfectly fine during a CI run, but becomes noticeable during a - # pre-commit hook. It is unnecessary to check the entire repository on every single - # commit, so we save some time here. - for file in "$@"; do - if [[ ("${file}" =~ \.cpp || "${file}" =~ \.h || "${file}" =~ \.in) ]]; then - echo "$file" - fi - done + find_all_source_files "$@" fi \ | xargs grep -E '(_DEBUG|DEBUG_)' \ | sed -re 's,^.*[^a-zA-Z0-9_]([a-zA-Z0-9_]*DEBUG[a-zA-Z0-9_]*).*$,\1,' \