From f1ae3d3fd0ce9701280e3089cf614d7b624bfc2c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 3 Apr 2014 21:42:23 -0400 Subject: [PATCH] use default keystore path when generating a new setup with init 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. --- fdroidserver/init.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fdroidserver/init.py b/fdroidserver/init.py index 4ecc3910..85da8ffc 100644 --- a/fdroidserver/init.py +++ b/fdroidserver/init.py @@ -192,11 +192,9 @@ def main(): write_to_config('keydname', keydname) if not os.path.isfile(keystore): # no existing or specified keystore, generate the whole thing - keystoredir = os.path.join(os.getenv('HOME'), - '.local', 'share', 'fdroidserver') + keystoredir = os.path.dirname(keystore) if not os.path.exists(keystoredir): os.makedirs(keystoredir, mode=0o700) - keystore = os.path.join(keystoredir, 'keystore.jks') write_to_config('keystore', keystore) password = genpassword() write_to_config('keystorepass', password)