Skip to content

Commit 09149ba

Browse files
committed
fix path
1 parent aaf2f70 commit 09149ba

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

builder/imports/jdk.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,20 @@ def install(self, env):
5656
'lib/**/jvm.dll', '**/lib/**/jvm.dll'],
5757
]
5858
found = 0
59-
60-
for paths in required_files:
61-
path_found = False
62-
for path in paths:
63-
for prefix in prefixes:
64-
if not prefix:
65-
continue
66-
full_path = os.path.join(prefix, path)
67-
if glob.glob(full_path, recursive=True):
68-
found += 1
69-
path_found = True
70-
break
71-
if path_found:
72-
break
59+
#
60+
# for paths in required_files:
61+
# path_found = False
62+
# for path in paths:
63+
# for prefix in prefixes:
64+
# if not prefix:
65+
# continue
66+
# full_path = os.path.join(prefix, path)
67+
# if glob.glob(full_path, recursive=True):
68+
# found += 1
69+
# path_found = True
70+
# break
71+
# if path_found:
72+
# break
7373

7474
if found >= len(required_files):
7575
print('Found existing JDK8 at {}'.format(prefix))
@@ -95,8 +95,8 @@ def install(self, env):
9595
print('Downloading {}'.format(url))
9696
fetch_and_extract(url, filename, install_dir)
9797
os.remove(filename)
98-
99-
jdk_home = glob.glob(os.path.join(install_dir, 'jdk*'))[0]
98+
print(glob.glob(os.path.join(install_dir, 'jdk*')))
99+
jdk_home = glob.glob(os.path.join(install_dir, '*jdk*'))[0]
100100
assert jdk_home
101101

102102
# OSX is special and has a Contents/Home folder inside the distro

0 commit comments

Comments
 (0)