Better gradle signing keys regexes

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 0dbe3e9ced5187dee6f9fd702550b29a711d48ed..0d0ccccd53028589a0247156845a042c025374f9 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1409,9 +1409,10 @@ def remove_signing_keys(build_dir):
     signing_configs = re.compile(r'^[\t ]*signingConfigs[ \t]*{[ \t]*$')
     line_matches = [
             re.compile(r'^[\t ]*signingConfig [^ ]*$'),
-            re.compile(r'android.signingConfigs.'),
-            re.compile(r'variant.outputFile = '),
-            re.compile(r'.readLine\('),
+            re.compile(r'.*android\.signingConfigs\..*'),
+            re.compile(r'.*variant\.outputFile = .*'),
+            re.compile(r'.*\.readLine\(.*'),
+            re.compile(r'.*System\.console\(\).*'),
     ]
     for root, dirs, files in os.walk(build_dir):
         if 'build.gradle' in files: