chiark / gitweb /
support installing as a Python .egg
authorHans-Christoph Steiner <hans@eds.org>
Fri, 31 Jul 2015 13:53:39 +0000 (15:53 +0200)
committerHans-Christoph Steiner <hans@eds.org>
Fri, 31 Jul 2015 22:38:41 +0000 (00:38 +0200)
For platforms where easy_install is a good option, like OSX, support
the Python .egg library format.

fdroidserver/init.py

index 1e77e2fe5e479545c3b0164b93e1f32a354d76e2..388c2aabd82f7a8960bf29dd192bb3e21090fe52 100644 (file)
@@ -70,7 +70,9 @@ def main():
     # find root install prefix
     tmp = os.path.dirname(sys.argv[0])
     if os.path.basename(tmp) == 'bin':
-        prefix = os.path.dirname(tmp)
+        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'
     else:
         # we're running straight out of the git repo