mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-09-17 10:40:12 +02:00
added java selection criteria for gentoo linux
This commit is contained in:
parent
b82f074919
commit
a30851ec98
@ -170,6 +170,8 @@ def _add_java_paths_to_config(pathlist, thisconfig):
|
|||||||
r'^java-([6-9])-oracle$', # Debian WebUpd8
|
r'^java-([6-9])-oracle$', # Debian WebUpd8
|
||||||
r'^jdk-([6-9])-oracle-.*$', # Debian make-jpkg
|
r'^jdk-([6-9])-oracle-.*$', # Debian make-jpkg
|
||||||
r'^java-([6-9])-openjdk-[^c][^o][^m].*$', # Debian
|
r'^java-([6-9])-openjdk-[^c][^o][^m].*$', # Debian
|
||||||
|
r'^oracle-jdk-bin-1\.([7-9]).*$', # Gentoo (oracle)
|
||||||
|
r'^icedtea-bin-([7-9]).*$', # Gentoo (openjdk)
|
||||||
]:
|
]:
|
||||||
m = re.match(regex, j)
|
m = re.match(regex, j)
|
||||||
if not m:
|
if not m:
|
||||||
@ -210,6 +212,8 @@ def fill_config_defaults(thisconfig):
|
|||||||
pathlist += glob.glob('/usr/java/jdk1.[6-9]*')
|
pathlist += glob.glob('/usr/java/jdk1.[6-9]*')
|
||||||
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]*')
|
||||||
|
pathlist += glob.glob('/opt/oracle-jdk-*1.[7-9]*')
|
||||||
|
pathlist += glob.glob('/opt/icedtea-*[7-9]*')
|
||||||
if os.getenv('JAVA_HOME') is not None:
|
if os.getenv('JAVA_HOME') is not None:
|
||||||
pathlist.append(os.getenv('JAVA_HOME'))
|
pathlist.append(os.getenv('JAVA_HOME'))
|
||||||
if os.getenv('PROGRAMFILES') is not None:
|
if os.getenv('PROGRAMFILES') is not None:
|
||||||
|
Loading…
Reference in New Issue
Block a user