diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-27 20:45:53 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-27 20:54:56 +0000 |
| commit | 1f9cd288f9c95b4de9e5cda036bfe7266e71a93d (patch) | |
| tree | 618a11fd530022135cc0f1b47abdc57b20e73e34 /ci | |
| parent | 2ef5a68b275f1ab034f50b7417846801fdc565d2 (diff) | |
| download | mullvadvpn-1f9cd288f9c95b4de9e5cda036bfe7266e71a93d.tar.xz mullvadvpn-1f9cd288f9c95b4de9e5cda036bfe7266e71a93d.zip | |
Change newlines
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/ci-android-xml.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/ci-android-xml.sh b/ci/ci-android-xml.sh index a75b93d21f..96dd2d27cb 100644 --- a/ci/ci-android-xml.sh +++ b/ci/ci-android-xml.sh @@ -4,7 +4,6 @@ # Autoformats Android XML files function tidy-up-android-xml { - tidy -xml \ -m \ -i \ @@ -13,6 +12,7 @@ function tidy-up-android-xml { --indent-spaces 4 \ --literal-attributes yes \ android/src/main/AndroidManifest.xml android/src/main/res/*/*.xml + # FIXME - when tidy learns to not leave whitespace around, remove the line below - https://github.com/htacg/tidy-html5/issues/864 find android/src/main/ -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';' } @@ -20,6 +20,7 @@ function tidy-up-android-xml { # Autoformats Android XML files and returns 0 if no files were actually changed, or 1 if files were changed function tidy-verify-xml { tidy-up-android-xml + if git diff --exit-code -- android/src/main/AndroidManifest.xml android/src/main/res; then echo "Android XML files are correctly formatted" return 0 |