diff options
Diffstat (limited to 'ci/ci-android-xml.sh')
| -rw-r--r-- | ci/ci-android-xml.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ci/ci-android-xml.sh b/ci/ci-android-xml.sh index b63e7ece1a..1d7c46020a 100644 --- a/ci/ci-android-xml.sh +++ b/ci/ci-android-xml.sh @@ -13,25 +13,25 @@ function tidy-up-android-xml { --indent-attributes yes \ --indent-spaces 4 \ --literal-attributes yes \ - android/src/main/AndroidManifest.xml \ - android/src/main/res/anim*/*.xml \ - android/src/main/res/drawable*/*.xml \ - android/src/main/res/layout*/*.xml \ - android/src/main/res/values/*.xml + android/app/src/main/AndroidManifest.xml \ + android/app/src/main/res/anim*/*.xml \ + android/app/src/main/res/drawable*/*.xml \ + android/app/src/main/res/layout*/*.xml \ + android/app/src/main/res/values/*.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]*$//' '{}' ';' + find android/app/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 --exit-code -- android/src/main/AndroidManifest.xml android/src/main/res; then + if git diff --exit-code -- android/app/src/main/AndroidManifest.xml android/app/src/main/res; then echo "Android XML files are correctly formatted" return 0 else - echo "android/src/main contains files that were changed, XML is not formatted properly" + echo "android/app/src/main contains files that were changed, XML is not formatted properly" return 1 fi } |