Allow ignoring symbol blacklist for super overlays
This commit is contained in:
parent
f9334e9d1c
commit
1d39ae5884
|
@ -5,7 +5,11 @@ cd "$base" || exit
|
||||||
|
|
||||||
#Usage: fail <file> <message> [ignore string]
|
#Usage: fail <file> <message> [ignore string]
|
||||||
fail() {
|
fail() {
|
||||||
if [ -z "$3" ] || ! grep -qF "$3" "$1";then
|
ignoreCheckPath="$1"
|
||||||
|
if [ -d "$ignoreCheckPath" ];then
|
||||||
|
ignoreCheckPath="$1/AndroidManifest.xml"
|
||||||
|
fi
|
||||||
|
if [ -z "$3" ] || ! grep -qF "$3" "$ignoreCheckPath";then
|
||||||
echo "Fatal: $1: $2"
|
echo "Fatal: $1: $2"
|
||||||
touch fail
|
touch fail
|
||||||
else
|
else
|
||||||
|
@ -21,7 +25,7 @@ find . -name AndroidManifest.xml |while read -r manifest;do
|
||||||
#Ensure this overlay doesn't override blacklist-ed properties
|
#Ensure this overlay doesn't override blacklist-ed properties
|
||||||
cat tests/blacklist |while read -r b;do
|
cat tests/blacklist |while read -r b;do
|
||||||
if grep -qRF "\"$b\"" "$folder";then
|
if grep -qRF "\"$b\"" "$folder";then
|
||||||
fail "$folder" "Overlay $folder is defining $b which is forbidden"
|
fail "$folder" "Overlay $folder is defining $b which is forbidden" "SUPER OVERLAY"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue