This should have less of a change of matching bad things.
thanks to @stf for the report. I ran tests comparing the original vs these
new patterns, and it was a 100% match. So at least it didn't make things
worse.
Here's the test script:
#!/usr/bin/env python3
import os
import re
old_vcsearch_g = re.compile(r'''.*[Vv]ersionCode[ =]+["']*([0-9]+)["']*''').search
old_vnsearch_g = re.compile(r'.*[Vv]ersionName *=* *(["\'])((?:(?=(\\?))\3.)*?)\1.*').search
old_psearch_g = re.compile(r'.*(packageName|applicationId) *=* *["\']([^"]+)["\'].*').search
new_vcsearch_g = re.compile(r'''.*[Vv]ersionCode\s*=?\s*["']*([0-9]+)["']*''').search
new_vnsearch_g = re.compile(r'''.*[Vv]ersionName\s*=?\s*(["'])((?:(?=(\\?))\3.)*?)\1.*''').search
new_psearch_g = re.compile(r'''.*(packageName|applicationId)\s*=*\s*["']([^"']+)["'].*''').search
old = re.compile(r'.*(packageName|applicationId) *=* *["\']([^"]+)["\'].*').search
new = re.compile(r'''.*(packageName|applicationId)\s*=*\s*["']([^"']+)["'].*''').search
for root, dirs, files in os.walk('build'):
for f in files:
if f.endswith('.gradle'):
with open(os.path.join(root, f)) as fp:
for line in fp:
for old, new in ((old_vcsearch_g, new_vcsearch_g),
(old_vnsearch_g, new_vnsearch_g),
(old_psearch_g, new_psearch_g)):
found_old = old(line)
found_new = new(line)
oldresult = None
newresult = None
if found_old or found_new:
if found_old:
oldresult = found_old.groups()
#print('OLD', oldresult)
if found_new:
newresult = found_new.groups()
#print('NEW', newresult)
if oldresult != newresult:
print('--------------------------------')
print(f, oldresult, newresult)
Apps can now use an XML icon, but if the app supports older Android
versions, it'll also contain PNG versions of the same icon. This finds
those PNGs and uses them instead.
#344closes#392
fdroiddata#913
In order to test that aapt defaults minSdkVersion to 3, I ran this script
then compared the output with meld:
cd $ANDROID_HOME/build-tools
for d in *.*; do echo $d; $ANDROID_HOME/build-tools/$d/aapt dump badging /home/hans/code/fdroid/server/tests/repo/com.politedroid_3.apk > /tmp/${d}.txt; done
meld /tmp/17.0.0.txt /tmp/26.0.2.txt /tmp/27.0.3.txt
When a new minor version of an NDK is released, it replaces an older one,
e.g. r16 with r16b (see commit 6f295cb). But old NDK package remains in
the cache and provisioning script unpacks it too as it matches the mask.
Fix NDK provisioning to unzip only while-listed versions.
`fdroid server init` is has not been needed for a long time. And 'server'
is the only subcommand that has its own subsubcommands. This turns it into
only `fdroid deploy`, which does what `fdroid server update` does. This
also changes the bash completion to use `fdroid deploy`. But the old
`fdroid server update` and `fdroid server init` commands remain working.
closes#264
Weblate, gettext, and Python-Babel all seem to have slightly different
wrapping rules. This leads to lots of annoying diffs and git merge
conflicts. So just don't wrap at all! :-D
Squashed commit of the following:
commit ecf5d51455
Author: Tobias_Groza <tobias.groza@outlook.de>
Date: Fri Feb 9 15:45:56 2018 +0000
Translated using Weblate (German)
Currently translated at 45.3% (180 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 8e88ed041a
Author: Takumi Shoji <azumukupoe1999@gmail.com>
Date: Wed Feb 7 13:31:22 2018 +0000
Added translation using Weblate (Japanese)
commit 1cb941084b
Author: Марс Ямбар <mjambarmeta@gmail.com>
Date: Sun Feb 4 11:31:42 2018 +0000
Translated using Weblate (Ukrainian)
Currently translated at 42.4% (169 of 398 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/uk/
commit 765b98f46f
Author: anonymous <>
Date: Sun Feb 4 09:24:22 2018 +0000
Translated using Weblate (German)
Currently translated at 43.0% (171 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 9cadc4463a
Author: Follpvosten <wolfi@karpador.xyz>
Date: Sun Feb 4 09:24:10 2018 +0000
Translated using Weblate (German)
Currently translated at 42.8% (170 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 50065b4e35
Author: anonymous <>
Date: Sun Feb 4 09:22:12 2018 +0000
Translated using Weblate (German)
Currently translated at 42.5% (169 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 8a752cdd9d
Author: ezjerry liao <ezjerry@gmail.com>
Date: Fri Feb 2 08:56:38 2018 +0000
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (397 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/
commit dd63360aae
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date: Thu Feb 1 18:53:17 2018 +0000
Translated using Weblate (German)
Currently translated at 41.0% (163 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 51b8b24f54
Author: anonymous <>
Date: Thu Feb 1 18:48:47 2018 +0000
Translated using Weblate (German)
Currently translated at 39.7% (158 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 41c9716d20
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date: Thu Feb 1 18:47:31 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 50cc7dba10
Author: anonymous <>
Date: Thu Feb 1 18:45:21 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 4ac4c4d829
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date: Thu Feb 1 18:45:08 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 95fe106077
Author: anonymous <>
Date: Thu Feb 1 18:44:58 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 1b08bc809e
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date: Thu Feb 1 18:44:08 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 96e9647bde
Author: anonymous <>
Date: Thu Feb 1 18:41:24 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit fe2b29d432
Author: Andreas Kleinert <Andy.Kleinert@gmail.com>
Date: Thu Feb 1 18:40:49 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 7c7877eded
Author: Luca D'Amico <damico.luca91@live.it>
Date: Mon Jan 29 16:54:49 2018 +0000
Translated using Weblate (Italian)
Currently translated at 36.2% (144 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/it/
commit 51a301b206
Author: anonymous <>
Date: Sun Jan 28 22:10:11 2018 +0000
Translated using Weblate (German)
Currently translated at 39.5% (157 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 8956165544
Author: dadnal <liberapay-weblate@com.beintner.de>
Date: Sun Jan 28 22:09:42 2018 +0000
Translated using Weblate (German)
Currently translated at 39.2% (156 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit f9ef03ddc3
Author: anonymous <>
Date: Sun Jan 28 22:09:32 2018 +0000
Translated using Weblate (German)
Currently translated at 39.2% (156 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit d26423fb9a
Author: dadnal <liberapay-weblate@com.beintner.de>
Date: Sun Jan 28 22:09:20 2018 +0000
Translated using Weblate (German)
Currently translated at 39.0% (155 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 4b2f03f310
Author: anonymous <>
Date: Sun Jan 28 22:08:41 2018 +0000
Translated using Weblate (German)
Currently translated at 38.7% (154 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit c13c602ae6
Author: dadnal <liberapay-weblate@com.beintner.de>
Date: Sun Jan 28 22:08:06 2018 +0000
Translated using Weblate (German)
Currently translated at 38.5% (153 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 195dddd89a
Author: anonymous <>
Date: Sun Jan 28 22:07:22 2018 +0000
Translated using Weblate (German)
Currently translated at 38.5% (153 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit e44c705053
Author: dadnal <liberapay-weblate@com.beintner.de>
Date: Sun Jan 28 22:06:51 2018 +0000
Translated using Weblate (German)
Currently translated at 38.2% (152 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 02a6882ea2
Author: anonymous <>
Date: Sun Jan 28 22:05:31 2018 +0000
Translated using Weblate (German)
Currently translated at 37.7% (150 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 68b8c4bc06
Author: dadnal <liberapay-weblate@com.beintner.de>
Date: Sun Jan 28 22:05:17 2018 +0000
Translated using Weblate (German)
Currently translated at 37.5% (149 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/de/
commit 40810ad9f9
Author: Alireza A. A <alir425p@gmail.com>
Date: Thu Jan 18 17:22:49 2018 +0000
Translated using Weblate (Persian)
Currently translated at 0.2% (1 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/fa/
commit f1c8192d0e
Author: ezjerry liao <ezjerry@gmail.com>
Date: Mon Jan 22 09:04:22 2018 +0000
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (397 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/
commit e92e8664f9
Author: Jeff Huang <s8321414@gmail.com>
Date: Tue Jan 16 02:37:32 2018 +0000
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (397 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/
commit e09a832dd0
Author: jxt <chihsun.tsai@gmail.com>
Date: Mon Jan 15 00:38:41 2018 +0000
Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (397 of 397 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/zh_Hant/
commit b22859288f
Author: monolifed <monolifed@gmail.com>
Date: Sat Jan 6 23:24:19 2018 +0000
Translated using Weblate (Turkish)
Currently translated at 37.4% (149 of 398 strings)
Translation: F-Droid/F-Droid Server
Translate-URL: https://hosted.weblate.org/projects/f-droid/fdroidserver/tr/
git-svn will put up the "Reject/Accept" prompt if it encounters a bad HTTPS
certificate. I could find no way to stop it from doing that. So instead,
this checks the HTTPS connection with an HTTP HEAD request first.
Subversion does not verify each commit as strongly as git does, so HTTPS is
really important. Also, there is the possibility of injecting code into
`fdroid checkupdate` calls if plain HTTP is used.
This uses both the env vars and the command line options to ensure
that it works with as many versions of git as possible. Also, git-svn
uses the env vars, but not necessarily the command line options.
This uses /bin/true to pretend that it succesfully got the password.
If password auth is truly required, then it will fail further on down
the line.
