@@ -56,20 +56,20 @@ def install(self, env):
56
56
'lib/**/jvm.dll' , '**/lib/**/jvm.dll' ],
57
57
]
58
58
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
73
73
74
74
if found >= len (required_files ):
75
75
print ('Found existing JDK8 at {}' .format (prefix ))
@@ -95,8 +95,8 @@ def install(self, env):
95
95
print ('Downloading {}' .format (url ))
96
96
fetch_and_extract (url , filename , install_dir )
97
97
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 ]
100
100
assert jdk_home
101
101
102
102
# OSX is special and has a Contents/Home folder inside the distro
0 commit comments