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

use default keystore path when generating a new setup with init

Browse source 
Before, the path to the keystore was also hardcoded in init.py, this makes
init now get it from the defaults set in common.py.
This commit is contained in:
Hans-Christoph Steiner 2014-04-03 21:42:23 -04:00
parent 0736367675
commit f1ae3d3fd0
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
fdroidserver/init.py
View file

@ -192,11 +192,9 @@ def main():
write_to_config('keydname', keydname) write_to_config('keydname', keydname)
if not os.path.isfile(keystore): if not os.path.isfile(keystore):
# no existing or specified keystore, generate the whole thing # no existing or specified keystore, generate the whole thing
keystoredir = os.path.join(os.getenv('HOME'), keystoredir = os.path.dirname(keystore)
'.local', 'share', 'fdroidserver')
if not os.path.exists(keystoredir): if not os.path.exists(keystoredir):
os.makedirs(keystoredir, mode=0o700) os.makedirs(keystoredir, mode=0o700)
keystore = os.path.join(keystoredir, 'keystore.jks')
write_to_config('keystore', keystore) write_to_config('keystore', keystore)
password = genpassword() password = genpassword()
write_to_config('keystorepass', password) write_to_config('keystorepass', password)