diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-07-28 13:52:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 08:52:25 -0400 |
| commit | 8078dec3be29f849f730fdd91a83fd2b1f89726e (patch) | |
| tree | 8ee324a83c1f15c6f56105e4ee930baacbdd2e95 | |
| parent | Option to allow server admins to join complex rooms (#7902) (diff) | |
| download | synapse-8078dec3be29f849f730fdd91a83fd2b1f89726e.tar.xz | |
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.
| -rw-r--r-- | changelog.d/7970.misc | 1 | ||||
| -rwxr-xr-x | scripts-dev/check_line_terminators.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelog.d/7970.misc b/changelog.d/7970.misc new file mode 100644 index 0000000000..ee9f1a7114 --- /dev/null +++ b/changelog.d/7970.misc @@ -0,0 +1 @@ +Add a script to detect source code files using non-unix line terminators. \ No newline at end of file diff --git a/scripts-dev/check_line_terminators.sh b/scripts-dev/check_line_terminators.sh index 0f430e8397..c983956231 100755 --- a/scripts-dev/check_line_terminators.sh +++ b/scripts-dev/check_line_terminators.sh @@ -28,4 +28,7 @@ cd `dirname $0`/.. # 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 |