mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-08 00:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Hans-Christoph Steiner 2016-02-15 19:58:05 +01:00
parent c9394b1c99
commit 0bdbadabff
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/init.py
View file

@ -66,17 +66,17 @@ def main():
# find root install prefix # find root install prefix
tmp = os.path.dirname(sys.argv[0]) tmp = os.path.dirname(sys.argv[0])
examplesdir = None
if os.path.basename(tmp) == 'bin': if os.path.basename(tmp) == 'bin':
prefix = None
egg_link = os.path.join(tmp, '..', 'local/lib/python2.7/site-packages/fdroidserver.egg-link') egg_link = os.path.join(tmp, '..', 'local/lib/python2.7/site-packages/fdroidserver.egg-link')
if os.path.exists(egg_link): if os.path.exists(egg_link):
# installed from local git repo # installed from local git repo
examplesdir = os.path.join(open(egg_link).readline().rstrip(), 'examples') examplesdir = os.path.join(open(egg_link).readline().rstrip(), 'examples')
else: else:
prefix = os.path.dirname(os.path.dirname(__file__)) # use .egg layout # try .egg layout
if not prefix.endswith('.egg'): # use UNIX layout examplesdir = os.path.dirname(os.path.dirname(__file__)) + '/share/doc/fdroidserver/examples'
prefix = os.path.dirname(tmp) if not os.path.exists(examplesdir): # use UNIX layout
examplesdir = prefix + '/share/doc/fdroidserver/examples' examplesdir = os.path.dirname(tmp) + '/share/doc/fdroidserver/examples'
else: else:
# we're running straight out of the git repo # we're running straight out of the git repo
prefix = os.path.normpath(os.path.join(os.path.dirname(__file__), '..')) prefix = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))