From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 31 Jul 2015 13:53:39 +0000 (+0200)
Subject: support installing as a Python .egg
X-Git-Tag: 0.4.0~8^2~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1c1f481fccdcb893cf78d8bb35ca9a678436d35d;p=fdroidserver.git

support installing as a Python .egg

For platforms where easy_install is a good option, like OSX, support
the Python .egg library format.
---

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 1e77e2fe..388c2aab 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -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