diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-28 10:02:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 10:02:59 +0200 |
| commit | 2efba270899b2852fa67cad05a55fc81decb24cd (patch) | |
| tree | a3fc81d88798dda19472aa1d577f910a31ae1c89 | |
| parent | a5f6c2473429f0a5e93b0d6a7eafa98b85da0fb1 (diff) | |
| parent | 05a418f9e648191e45fbc8e4cd43cd0c1c56b56f (diff) | |
Merge pull request #40783 from aaronfranke/bom
Fix incorrect comments in file formatting script
| -rwxr-xr-x | misc/scripts/file_format.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh index 773999cf0c..c570ec23a7 100755 --- a/misc/scripts/file_format.sh +++ b/misc/scripts/file_format.sh @@ -31,12 +31,12 @@ while IFS= read -rd '' f; do elif [[ "$f" == "platform/android/java/lib/src/com/google"* ]]; then continue fi - # Ensures that files are UTF-8 formatted. + # Ensure that files are UTF-8 formatted. recode UTF-8 "$f" 2> /dev/null - # Ensures that files have LF line endings. + # Ensure that files have LF line endings and do not contain a BOM. dos2unix "$f" 2> /dev/null - # Remove trailing space characters. - # -l option handles newlines conveniently and seems to also get rid of BOMs. + # Remove trailing space characters and ensures that files end + # with newline characters. -l option handles newlines conveniently. perl -i -ple 's/\s*$//g' "$f" # Remove the character sequence "== true" if it has a leading space. perl -i -pe 's/\x20== true//g' "$f" |