Fix exit code for check_line_terminators.sh (#7970)

If there are *no* files with CRLF line endings, then the xargs exits with a
non-zero exit code (as expected), but then, since that is the last thing to
happen in the script, the script as a whole exits non-zero, making the whole
thing fail.

using `if/then/fi` instead of `&& (...)` means that the script exits with a
zero exit code.
This commit is contained in:
Richard van der Hoff 2020-07-28 13:52:25 +01:00 committed by GitHub
parent 3857de2194
commit 8078dec3be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

1
changelog.d/7970.misc Normal file
View File

@ -0,0 +1 @@
Add a script to detect source code files using non-unix line terminators.

View File

@ -28,4 +28,7 @@
cd `dirname $0`/.. cd `dirname $0`/..
# Find and print files with non-unix line terminators # Find and print files with non-unix line terminators
find . -path './.git/*' -prune -o -type f -print0 | xargs -0 grep -I -l $'\r$' && ( echo 'found files with CRLF line endings'; exit 1 ) if find . -path './.git/*' -prune -o -type f -print0 | xargs -0 grep -I -l $'\r$'; then
echo -e '\e[31mERROR: found files with CRLF line endings. See above.\e[39m'
exit 1
fi