mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-06 11:00:13 +02:00
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.
This commit is contained in:
parent
c9394b1c99
commit
0bdbadabff
@ -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__), '..'))
|
||||||
|
Loading…
Reference in New Issue
Block a user