init: no error if examples/ dir cannot be found; overhaul repo_icon

There are so many possible installation paths for Python modules, it has
been very hard to even find and test them all.  This adds a fallback option
if the examples dir cannot be found.  A repo can work without an icon or
the example config.py.

This removes the fake assumption that the icon can be a full path in the
config.py.  While the path was being properly passed through to the index
file, the file was never copied properly into place nor rsynced to the web
server.

fdroidserver/common.py

@@ -147,7 +147,7 @@ default_config = {
     'keyaliases': {},
     'repo_url': "https://MyFirstFDroidRepo.org/fdroid/repo",
     'repo_name': "My First FDroid Repo Demo",
-    'repo_icon': "fdroid-icon.png",
+    'repo_icon': "icon.png",
     'repo_description': _('''
         This is a repository of apps to be used with FDroid. Applications in this
         repository are either official binaries built by the original application
@@ -228,7 +228,7 @@ def fill_config_defaults(thisconfig):
             return None
         return path
 
-    for k in ['sdk_path', 'ant', 'mvn3', 'gradle', 'keystore', 'repo_icon']:
+    for k in ['sdk_path', 'ant', 'mvn3', 'gradle', 'keystore']:
         v = thisconfig[k]
         exp = expand_path(v)
         if exp is not None:

fdroidserver/index.py

@@ -75,13 +75,13 @@ def make(apps, apks, repodir, archive):
 
     if archive:
         repodict['name'] = common.config['archive_name']
-        repodict['icon'] = os.path.basename(common.config['archive_icon'])
+        repodict['icon'] = common.config.get('archive_icon', common.default_config['repo_icon'])
         repodict['address'] = common.config['archive_url']
         repodict['description'] = common.config['archive_description']
         urlbasepath = os.path.basename(urllib.parse.urlparse(common.config['archive_url']).path)
     else:
         repodict['name'] = common.config['repo_name']
-        repodict['icon'] = os.path.basename(common.config['repo_icon'])
+        repodict['icon'] = common.config.get('repo_icon', common.default_config['repo_icon'])
         repodict['address'] = common.config['repo_url']
         repodict['description'] = common.config['repo_description']
         urlbasepath = os.path.basename(urllib.parse.urlparse(common.config['repo_url']).path)
@@ -331,7 +331,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing
     doc.appendChild(root)
 
     repoel = doc.createElement("repo")
-    repoel.setAttribute("icon", os.path.basename(repodict['icon']))
+    repoel.setAttribute("icon", repodict['icon'])
     if 'maxage' in repodict:
         repoel.setAttribute("maxage", str(repodict['maxage']))
     repoel.setAttribute("name", repodict['name'])
@@ -604,7 +604,7 @@ def make_v0(apps, apks, repodir, repodict, requestsdict, fdroid_signing_key_fing
     if os.path.exists(repo_icon):
         shutil.copyfile(common.config['repo_icon'], iconfilename)
     else:
-        logging.warning(_('repo_icon %s does not exist, generating placeholder.')
+        logging.warning(_('repo_icon "repo/icons/%s" does not exist, generating placeholder.')
                         % repo_icon)
         os.makedirs(os.path.dirname(iconfilename), exist_ok=True)
         try:

fdroidserver/init.py

@@ -120,8 +120,17 @@ def main():
         # 'metadata' and 'tmp' are created in fdroid
         if not os.path.exists('repo'):
             os.mkdir('repo')
-        shutil.copy(os.path.join(examplesdir, 'fdroid-icon.png'), fdroiddir)
-        shutil.copyfile(os.path.join(examplesdir, 'config.yml'), 'config.yml')
+        example_config_yml = os.path.join(examplesdir, 'config.yml')
+        if os.path.exists(example_config_yml):
+            shutil.copyfile(example_config_yml, 'config.yml')
+        else:
+            from pkg_resources import get_distribution
+            versionstr = get_distribution('fdroidserver').version
+            if not versionstr:
+                versionstr = 'master'
+            with open('config.yml', 'w') as fp:
+                fp.write('# see https://gitlab.com/fdroid/fdroidserver/blob/'
+                         + versionstr + '/examples/config.yml\n')
         os.chmod('config.yml', 0o0600)
         # If android_home is None, test_config['sdk_path'] will be used and
         # "$ANDROID_HOME" may be used if the env var is set up correctly.

fdroidserver/nightly.py

@@ -192,7 +192,7 @@ def main():
         readme = '''
 # {repo_git_base}
 
-[![{repo_url}](icon.png)]({repo_url})
+[![{repo_url}]({repo_url}/icons/icon.png)]({repo_url})
 
 Last updated: {date}'''.format(repo_git_base=repo_git_base,
                                repo_url=repo_url,
@@ -202,16 +202,8 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
         mirror_git_repo.git.add(all=True)
         mirror_git_repo.index.commit("update README")
 
-        icon_path = os.path.join(git_mirror_path, 'icon.png')
-        try:
-            import qrcode
-            qrcode.make(repo_url).save(icon_path)
-        except Exception:
-            exampleicon = os.path.join(common.get_examples_dir(), 'fdroid-icon.png')
-            shutil.copy(exampleicon, icon_path)
         mirror_git_repo.git.add(all=True)
         mirror_git_repo.index.commit("update repo/website icon")
-        shutil.copy(icon_path, repo_basedir)
 
         os.chdir(repo_basedir)
         if os.path.isdir(git_mirror_repodir):
@@ -234,11 +226,9 @@ Last updated: {date}'''.format(repo_git_base=repo_git_base,
         config += "identity_file = '%s'\n" % ssh_private_key_file
         config += "repo_name = '%s'\n" % repo_git_base
         config += "repo_url = '%s'\n" % repo_url
-        config += "repo_icon = 'icon.png'\n"
         config += "repo_description = 'Nightly builds from %s'\n" % git_user_email
         config += "archive_name = '%s'\n" % (repo_git_base + ' archive')
         config += "archive_url = '%s'\n" % (repo_base + '/archive')
-        config += "archive_icon = 'icon.png'\n"
         config += "archive_description = 'Old nightly builds that have been archived.'\n"
         config += "archive_older = %i\n" % options.archive_older
         config += "servergitmirrors = '%s'\n" % servergitmirror

fdroidserver/update.py

@@ -2244,9 +2244,8 @@ def main():
     for k in ['repo_icon', 'archive_icon']:
         if k in config:
             if not os.path.exists(config[k]):
-                logging.critical(_('{name} "{path}" does not exist! Correct it in config.py.')
-                                 .format(name=k, path=config[k]))
-                sys.exit(1)
+                logging.warning(_('{name} "{section}/icons/{path}" does not exist! Check "config.yml".')
+                                .format(name=k, section=k.split('_')[0], path=config[k]))
 
     # if the user asks to create a keystore, do it now, reusing whatever it can
     if options.create_key: