From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 15 Feb 2016 18:58:05 +0000 (+0100)
Subject: init: check if examples/ exists in layout before using the path
X-Git-Tag: 0.6.0~5^2~3
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0bdbadabffb9a738cb67620838cdcb23efd2b737;p=fdroidserver.git

init: check if examples/ exists in layout before using the path

There is definitely some odd stuff that happens in all these paths, so
let's just check that examples/ exists, and move on from there.
---

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 3474fba1..f8f71bfb 100644
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -66,17 +66,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__), '..'))