diff options
| author | Albin <albin@mullvad.net> | 2023-07-27 09:40:33 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-07-27 10:41:29 +0200 |
| commit | cfb35ffc1f5ffcf95737ca20675a2de149e24ef3 (patch) | |
| tree | ec5968eadf13643738edc27e75ab1de40de87f72 /android | |
| parent | 5d1c5ab992eadb08cb51c33d40d894d6024ab4e0 (diff) | |
| download | mullvadvpn-cfb35ffc1f5ffcf95737ca20675a2de149e24ef3.tar.xz mullvadvpn-cfb35ffc1f5ffcf95737ca20675a2de149e24ef3.zip | |
Update tidy script with new resource path
Diffstat (limited to 'android')
| -rwxr-xr-x | android/scripts/tidy.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/android/scripts/tidy.sh b/android/scripts/tidy.sh index a31be34233..0372febcda 100755 --- a/android/scripts/tidy.sh +++ b/android/scripts/tidy.sh @@ -33,10 +33,10 @@ function format { --indent-attributes yes \ --indent-spaces 4 \ --literal-attributes yes \ - ../app/src/main/AndroidManifest.xml \ - ../app/src/main/res/anim*/*.xml \ - ../app/src/main/res/drawable*/*.xml \ - ../app/src/main/res/layout*/*.xml \ + ../**/src/main/AndroidManifest.xml \ + ../lib/resource/src/main/res/anim*/*.xml \ + ../lib/resource/src/main/res/drawable*/*.xml \ + ../app/src/main/res/layout*/*.xml tidy -xml \ -m \ @@ -47,14 +47,14 @@ function format { --indent-spaces 4 \ --literal-attributes yes \ --indent-cdata yes \ - ../app/src/main/res/values/*.xml + ../lib/resource/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 ../app/src/main/ -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';' + find .. -name '*.xml' -exec sed -i -e 's/[ \t]*$//' '{}' ';' } function checkDiff { - if git diff --exit-code -- ../app/src/main/AndroidManifest.xml ../app/src/main/res; then + if git diff --exit-code -- ../**/AndroidManifest.xml ../**/src/main/res; then echo "Android XML files are correctly formatted" return 0 else |