-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
#
-# update.py - part of the FDroid server tools
+# init.py - part of the FDroid server tools
# Copyright (C) 2010-2013, Ciaran Gultnieks, ciaran@ciarang.com
# Copyright (C) 2013-2014 Daniel Martà <mvdan@mvdan.cc>
# Copyright (C) 2013 Hans-Christoph Steiner <hans@eds.org>
import shutil
import socket
import sys
-from optparse import OptionParser
+from argparse import ArgumentParser
import logging
-import common
+from . import _
+from . import common
+from .exception import FDroidException
config = {}
options = None
def disable_in_config(key, value):
'''write a key/value to the local config.py, then comment it out'''
- with open('config.py', 'r') as f:
+ with open('config.py', 'r', encoding='utf8') as f:
data = f.read()
pattern = '\n[\s#]*' + key + '\s*=\s*"[^"]*"'
repl = '\n#' + key + ' = "' + value + '"'
data = re.sub(pattern, repl, data)
- with open('config.py', 'w') as f:
+ with open('config.py', 'w', encoding='utf8') as f:
f.writelines(data)
global options, config
# Parse command line...
- parser = OptionParser()
- parser.add_option("-v", "--verbose", action="store_true", default=False,
- help="Spew out even more information than normal")
- parser.add_option("-q", "--quiet", action="store_true", default=False,
- help="Restrict output to warnings and errors")
- parser.add_option("-d", "--distinguished-name", default=None,
- help="X.509 'Distiguished Name' used when generating keys")
- parser.add_option("--keystore", default=None,
- help="Path to the keystore for the repo signing key")
- parser.add_option("--repo-keyalias", default=None,
- help="Alias of the repo signing key in the keystore")
- parser.add_option("--android-home", default=None,
- help="Path to the Android SDK (sometimes set in ANDROID_HOME)")
- parser.add_option("--no-prompt", action="store_true", default=False,
- help="Do not prompt for Android SDK path, just fail")
- (options, args) = parser.parse_args()
-
- # find root install prefix
- tmp = os.path.dirname(sys.argv[0])
- if os.path.basename(tmp) == 'bin':
- prefix = os.path.dirname(tmp)
- examplesdir = prefix + '/share/doc/fdroidserver/examples'
- else:
- # we're running straight out of the git repo
- prefix = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))
- examplesdir = prefix + '/examples'
+ parser = ArgumentParser()
+ common.setup_global_opts(parser)
+ parser.add_argument("-d", "--distinguished-name", default=None,
+ help=_("X.509 'Distinguished Name' used when generating keys"))
+ parser.add_argument("--keystore", default=None,
+ help=_("Path to the keystore for the repo signing key"))
+ parser.add_argument("--repo-keyalias", default=None,
+ help=_("Alias of the repo signing key in the keystore"))
+ parser.add_argument("--android-home", default=None,
+ help=_("Path to the Android SDK (sometimes set in ANDROID_HOME)"))
+ parser.add_argument("--no-prompt", action="store_true", default=False,
+ help=_("Do not prompt for Android SDK path, just fail"))
+ options = parser.parse_args()
aapt = None
fdroiddir = os.getcwd()
test_config = dict()
+ examplesdir = common.get_examples_dir()
common.fill_config_defaults(test_config)
# track down where the Android SDK is, the default is to use the path set
# make sure at least aapt is found, since this can't do anything without it
test_config['aapt'] = common.find_sdk_tools_cmd('aapt')
else:
- # if neither --android-home nor the default sdk_path exist, prompt the user
+ # if neither --android-home nor the default sdk_path
+ # exist, prompt the user using platform-specific default
default_sdk_path = '/opt/android-sdk'
+ if sys.platform == 'win32' or sys.platform == 'cygwin':
+ p = os.path.join(os.getenv('USERPROFILE'),
+ 'AppData', 'Local', 'Android', 'android-sdk')
+ elif sys.platform == 'darwin':
+ # on OSX, Homebrew is common and has an easy path to detect
+ p = '/usr/local/opt/android-sdk'
+ else:
+ # if the Debian packages are installed, suggest them
+ p = '/usr/lib/android-sdk'
+ if os.path.exists(p):
+ default_sdk_path = p
+
while not options.no_prompt:
try:
- s = raw_input('Enter the path to the Android SDK ('
- + default_sdk_path + ') here:\n> ')
+ s = input(_('Enter the path to the Android SDK (%s) here:\n> ') % default_sdk_path)
except KeyboardInterrupt:
print('')
sys.exit(1)
if common.test_sdk_exists(test_config):
break
if not common.test_sdk_exists(test_config):
- sys.exit(3)
+ raise FDroidException("Android SDK not found.")
if not os.path.exists('config.py'):
# 'metadata' and 'tmp' are created in fdroid
else:
logging.warn('Looks like this is already an F-Droid repo, cowardly refusing to overwrite it...')
logging.info('Try running `fdroid init` in an empty directory.')
- sys.exit()
+ raise FDroidException('Repository already exists.')
- if 'aapt' not in test_config or not os.path.isfile(test_config['aapt']):
+ if common.use_androguard():
+ pass
+ elif 'aapt' not in test_config or not os.path.isfile(test_config['aapt']):
# try to find a working aapt, in all the recent possible paths
build_tools = os.path.join(test_config['sdk_path'], 'build-tools')
aaptdirs = []
if os.path.isfile(os.path.join(d, 'aapt')):
aapt = os.path.join(d, 'aapt')
break
- if os.path.isfile(aapt):
+ if aapt and os.path.isfile(aapt):
dirname = os.path.basename(os.path.dirname(aapt))
if dirname == 'build-tools':
# this is the old layout, before versioned build-tools
+ '" does not exist, creating a new keystore there.')
common.write_to_config(test_config, 'keystore', keystore)
repo_keyalias = None
+ keydname = None
if options.repo_keyalias:
repo_keyalias = options.repo_keyalias
common.write_to_config(test_config, 'repo_keyalias', repo_keyalias)
flags=re.MULTILINE)
with open('opensc-fdroid.cfg', 'w') as f:
f.write(opensc_fdroid)
- elif not os.path.exists(keystore):
+ elif os.path.exists(keystore):
+ to_set = ['keystorepass', 'keypass', 'repo_keyalias', 'keydname']
+ if repo_keyalias:
+ to_set.remove('repo_keyalias')
+ if keydname:
+ to_set.remove('keydname')
+ logging.warning('\n' + _('Using existing keystore "{path}"').format(path=keystore)
+ + '\n' + _('Now set these in config.py:') + ' '
+ + ', '.join(to_set) + '\n')
+ else:
password = common.genpassword()
c = dict(test_config)
c['keystorepass'] = password
common.write_to_config(test_config, 'keydname', c['keydname'])
common.genkeystore(c)
- logging.info('Built repo based in "' + fdroiddir + '"')
- logging.info('with this config:')
- logging.info(' Android SDK:\t\t\t' + config['sdk_path'])
+ msg = '\n'
+ msg += _('Built repo based in "%s" with this config:') % fdroiddir
+ msg += '\n\n Android SDK:\t\t\t' + config['sdk_path']
if aapt:
- logging.info(' Android SDK Build Tools:\t' + os.path.dirname(aapt))
- logging.info(' Android NDK r10d (optional):\t$ANDROID_NDK')
- logging.info(' Keystore for signing key:\t' + keystore)
+ msg += '\n Android SDK Build Tools:\t' + os.path.dirname(aapt)
+ msg += '\n Android NDK r12b (optional):\t$ANDROID_NDK'
+ msg += '\n ' + _('Keystore for signing key:\t') + keystore
if repo_keyalias is not None:
- logging.info(' Alias for key in store:\t' + repo_keyalias)
- logging.info('\nTo complete the setup, add your APKs to "' +
- os.path.join(fdroiddir, 'repo') + '"' + '''
+ msg += '\n Alias for key in store:\t' + repo_keyalias
+ msg += '\n\n' + '''To complete the setup, add your APKs to "%s"
then run "fdroid update -c; fdroid update". You might also want to edit
"config.py" to set the URL, repo name, and more. You should also set up
a signing key (a temporary one might have been automatically generated).
-For more info: https://f-droid.org/manual/fdroid.html#Simple-Binary-Repository
-and https://f-droid.org/manual/fdroid.html#Signing
-''')
+For more info: https://f-droid.org/docs/Setup_an_F-Droid_App_Repo
+and https://f-droid.org/docs/Signing_Process''' % os.path.join(fdroiddir, 'repo')
+ logging.info(msg)
~ianmdlvl / fdroidserver.git / blobdiff