kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-19 21:30:10 +01:00
Code Activity

Reverted the change in the default config.py

Browse Source 
Improved the detection of keytool and jarsigner by also searching the PATH environment variable
This commit is contained in:
Cyril Russo 2018-08-17 16:46:46 +02:00
parent 4f21045cad
commit ace33bcfc0
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/config.py
View File

@ -118,9 +118,6 @@ The repository of older versions of applications from the main demo repository.
# keystore. # keystore.
# repo_pubkey = "..." # repo_pubkey = "..."
# The keytool command to run to get Java's keytool version
keytool = "keytool"
# The keystore to use for release keys when building. This needs to be # The keystore to use for release keys when building. This needs to be
# somewhere safe and secure, and backed up! The best way to manage these # somewhere safe and secure, and backed up! The best way to manage these
# sensitive keys is to use a "smartcard" (aka Hardware Security Module). To # sensitive keys is to use a "smartcard" (aka Hardware Security Module). To

12
fdroidserver/common.py
View File

@ -236,6 +236,18 @@ def fill_config_defaults(thisconfig):
thisconfig['keytool'] = os.path.join(java_home, 'bin', 'keytool') thisconfig['keytool'] = os.path.join(java_home, 'bin', 'keytool')
break break
if 'jarsigner' not in thisconfig:
for path in os.environ['PATH'].split(':'):
jarsigner = os.path.join(path, 'jarsigner')
if os.path.exists(jarsigner):
thisconfig['jarsigner'] = jarsigner
else:
continue
keytool = os.path.join(path, 'keytool')
if os.path.exists(keytool):
thisconfig['keytool'] = keytool
break
for k in ['ndk_paths', 'java_paths']: for k in ['ndk_paths', 'java_paths']:
d = thisconfig[k] d = thisconfig[k]
for k2 in d.copy(): for k2 in d.copy():