From: Hans-Christoph Steiner Date: Fri, 31 Jul 2015 22:36:51 +0000 (+0200) Subject: support egg-link format when installed from git repo X-Git-Tag: 0.4.0~8^2~1 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a020625462fe3176e1bce0d6023ee2be0dd8a2ac;p=fdroidserver.git support egg-link format when installed from git repo If you run `python setup.py install` from the git repo, then it will be installed using the .egg-link format, which just points to the git repo. `fdroid init` needs to handle that when looking for example files to copy. --- diff --git a/fdroidserver/init.py b/fdroidserver/init.py index 388c2aab..0ed66d6b 100644 --- a/fdroidserver/init.py +++ b/fdroidserver/init.py @@ -70,10 +70,16 @@ def main(): # find root install prefix tmp = os.path.dirname(sys.argv[0]) if os.path.basename(tmp) == 'bin': - 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' + 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' else: # we're running straight out of the git repo prefix = os.path.normpath(os.path.join(os.path.dirname(__file__), '..'))