Switch all headers to python3

[fdroidserver.git] / fdroidserver / init.py

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index cf75b911d5391fd17bc3e3531ce727475ee55cd0..3d8679ffced958593a9776efb2e2356bca14398a 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
 #
 # update.py - part of the FDroid server tools
 # Copyright (C) 2010-2013, Ciaran Gultnieks, ciaran@ciarang.com
@@ -51,10 +50,7 @@ def main():
 
     # Parse command line...
     parser = ArgumentParser()
-    parser.add_argument("-v", "--verbose", action="store_true", default=False,
-                        help="Spew out even more information than normal")
-    parser.add_argument("-q", "--quiet", action="store_true", default=False,
-                        help="Restrict output to warnings and errors")
+    common.setup_global_opts(parser)
     parser.add_argument("-d", "--distinguished-name", default=None,
                         help="X.509 'Distiguished Name' used when generating keys")
     parser.add_argument("--keystore", default=None,
@@ -69,17 +65,17 @@ def main():
 
     # find root install prefix
     tmp = os.path.dirname(sys.argv[0])
+    examplesdir = None
     if os.path.basename(tmp) == 'bin':
-        prefix = None
         egg_link = os.path.join(tmp, '..', 'local/lib/python2.7/site-packages/fdroidserver.egg-link')
         if os.path.exists(egg_link):
             # installed from local git repo
             examplesdir = os.path.join(open(egg_link).readline().rstrip(), 'examples')
         else:
-            prefix = os.path.dirname(os.path.dirname(__file__))  # use .egg layout
-            if not prefix.endswith('.egg'):  # use UNIX layout
-                prefix = os.path.dirname(tmp)
-            examplesdir = prefix + '/share/doc/fdroidserver/examples'
+            # try .egg layout
+            examplesdir = os.path.dirname(os.path.dirname(__file__)) + '/share/doc/fdroidserver/examples'
+            if not os.path.exists(examplesdir):  # use UNIX layout
+                examplesdir = os.path.dirname(tmp) + '/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__), '..'))