diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-27 19:46:19 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-02-27 20:54:56 +0000 |
| commit | 25aad749715522ea072296097bf30101be499538 (patch) | |
| tree | 42ecd2817fdd5733f05f68ca42b856761048b5c2 /ci | |
| parent | 04c18f26297332b529b919ff19170605ff96cbdc (diff) | |
| download | mullvadvpn-25aad749715522ea072296097bf30101be499538.tar.xz mullvadvpn-25aad749715522ea072296097bf30101be499538.zip | |
Update XML formatting script to include manifest
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/ci-android-xml.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/ci-android-xml.sh b/ci/ci-android-xml.sh index 6ebf27672f..e15cc3a4b3 100644 --- a/ci/ci-android-xml.sh +++ b/ci/ci-android-xml.sh @@ -12,17 +12,17 @@ function tidy-up-android-xml { --indent-attributes yes \ --indent-spaces 4 \ --literal-attributes yes \ - android/src/main/res/*/*.xml + 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/res/ -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';' + find android/src/main/ -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';' } # 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 android/src/main/res/ | wc -l) > 0 )); then - echo "android/src/main/res contains that were changed, XML is not formatted properly" - git diff android/src/main/res/ + if (( $(git diff android/src/main/AndroidManifest.xml android/src/main/res/ | wc -l) > 0 )); then + echo "android/src/main contains that were changed, XML is not formatted properly" + git diff -- android/src/main/AndroidManifest.xml android/src/main/res return 1; else echo "Android XML files are correctly formatted" |