diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-17 13:10:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-17 13:10:27 +0100 |
| commit | 1efb4ee6b3291e8b3d51af99d81932ed9359e900 (patch) | |
| tree | cf425a6a5a90d1e4af8d8097177f6ca324fd3f46 /misc | |
| parent | a3c52b62db6494d38fac49a6b48975a7ae7498d9 (diff) | |
| parent | aed41cdfc9c2ba6d1458567715f384b8760ba8d1 (diff) | |
Merge pull request #46050 from akien-mga/ci-simplify-file_format
CI: Remove file_format.sh changes hard to reproduce on Windows
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/scripts/file_format.sh | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh index 0e9db68a90..813c7d9f35 100755 --- a/misc/scripts/file_format.sh +++ b/misc/scripts/file_format.sh @@ -38,15 +38,6 @@ while IFS= read -rd '' f; do # 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" - - if [[ $(uname) == "Linux" ]] && [[ "$f" != *"xml" ]]; then - # Remove empty lines after the opening brace of indented blocks. - sed -z -i 's/\x7B\x0A\x0A\x09/\x7B\x0A\x09/g' "$f" - # Remove empty lines before the closing brace (in some cases). - sed -z -i 's/\x0A\x0A\x7D/\x0A\x7D/g' "$f" - fi done git diff > patch.patch |