mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-13 14:32:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

install: add --privacy-mode flag

Browse source
This commit is contained in:
Hans-Christoph Steiner 2024-10-21 20:04:02 +02:00
parent c7bc8d0fea
commit 3a3417f6f8
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
completion/bash-completion
View file

@ -109,8 +109,8 @@ __complete_gpgsign() {
} }
__complete_install() { __complete_install() {
opts="-v -q" opts="-v -q -a -p"
lopts="--verbose --quiet --all" lopts="--verbose --quiet --all --privacy-mode"
case "${cur}" in case "${cur}" in
-*) -*)
__complete_options __complete_options

16
fdroidserver/install.py
View file

@ -37,7 +37,8 @@ config = None
DEFAULT_IPFS_GATEWAYS = ("https://gateway.ipfs.io/ipfs/",) DEFAULT_IPFS_GATEWAYS = ("https://gateway.ipfs.io/ipfs/",)
def download_apk(appid='org.fdroid.fdroid'): # pylint: disable=unused-argument
def download_apk(appid='org.fdroid.fdroid', privacy_mode=False):
"""Download an APK from F-Droid via the first mirror that works.""" """Download an APK from F-Droid via the first mirror that works."""
url = urlunparse( url = urlunparse(
urlparse(common.FDROIDORG_MIRRORS[0]['url'])._replace( urlparse(common.FDROIDORG_MIRRORS[0]['url'])._replace(
@ -72,7 +73,7 @@ def download_apk(appid='org.fdroid.fdroid'):
return str(f.rename(f.with_stem(f'{appid}_{versionCode}')).resolve()) return str(f.rename(f.with_stem(f'{appid}_{versionCode}')).resolve())
def download_fdroid_apk(): def download_fdroid_apk(privacy_mode=False): # pylint: disable=unused-argument
"""Directly download the current F-Droid APK and verify it. """Directly download the current F-Droid APK and verify it.
This downloads the "download button" link, which is the version This downloads the "download button" link, which is the version
@ -112,7 +113,7 @@ def install_fdroid_apk(privacy_mode=False):
download_methods = [download_apk, download_fdroid_apk] download_methods = [download_apk, download_fdroid_apk]
for method in download_methods: for method in download_methods:
try: try:
f = method() f = method(privacy_mode=privacy_mode)
break break
except Exception as e: except Exception as e:
logging.info(e) logging.info(e)
@ -212,6 +213,13 @@ def main():
default=False, default=False,
help=_("Install all signed applications available"), help=_("Install all signed applications available"),
) )
parser.add_argument(
"-p",
"--privacy-mode",
action="store_true",
default=False,
help=_("Download F-Droid.apk using mirrors that leak less to the network"),
)
options = common.parse_args(parser) options = common.parse_args(parser)
common.set_console_logging(options.verbose) common.set_console_logging(options.verbose)
@ -258,7 +266,7 @@ def main():
install_apks_to_devices(apks.values()) install_apks_to_devices(apks.values())
else: else:
sys.exit(install_fdroid_apk()) sys.exit(install_fdroid_apk(options.privacy_mode))
logging.info('\n' + _('Finished')) logging.info('\n' + _('Finished'))