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

Merge branch 'java-home-lookup' into 'master'

Browse source 
Fix JDK lookup

Fix two cases when JDK path lookup could fail (found those issues on my Fedora 24 box).

See merge request !153
This commit is contained in:
Hans-Christoph Steiner 2016-08-09 15:44:06 +00:00
commit abb4c5587f
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -136,7 +136,7 @@ def fill_config_defaults(thisconfig):
pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[6-9].0.jdk') pathlist += glob.glob('/System/Library/Java/JavaVirtualMachines/1.[6-9].0.jdk')
pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[6-9]*') pathlist += glob.glob('/Library/Java/JavaVirtualMachines/*jdk*[6-9]*')
if os.getenv('JAVA_HOME') is not None: if os.getenv('JAVA_HOME') is not None:
pathlist += os.getenv('JAVA_HOME') pathlist.append(os.getenv('JAVA_HOME'))
if os.getenv('PROGRAMFILES') is not None: if os.getenv('PROGRAMFILES') is not None:
pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[6-9].*')) pathlist += glob.glob(os.path.join(os.getenv('PROGRAMFILES'), 'Java', 'jdk1.[6-9].*'))
for d in sorted(pathlist): for d in sorted(pathlist):
@ -159,11 +159,9 @@ def fill_config_defaults(thisconfig):
m = re.match(regex, j) m = re.match(regex, j)
if not m: if not m:
continue continue
osxhome = os.path.join(d, 'Contents', 'Home') for p in [d, os.path.join(d, 'Contents', 'Home')]:
if os.path.exists(osxhome): if os.path.exists(os.path.join(p, 'bin', 'javac')):
thisconfig['java_paths'][m.group(1)] = osxhome thisconfig['java_paths'][m.group(1)] = p
else:
thisconfig['java_paths'][m.group(1)] = d
for java_version in ('7', '8', '9'): for java_version in ('7', '8', '9'):
if java_version not in thisconfig['java_paths']: if java_version not in thisconfig['java_paths']: