Skip to content
This repository was archived by the owner on Dec 19, 2024. It is now read-only.

Commit 371da7f

Browse files
antoinecoantoineco
committed
implement checksum check (list still to complete)
refactoring
1 parent 3cd5558 commit 371da7f

File tree

4 files changed

+355
-68
lines changed

4 files changed

+355
-68
lines changed

‎manifests/checksums.pp‎

Lines changed: 276 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,276 @@
1+
# == Class: oracle_java::checksums
2+
class oracle_java::checksums {
3+
case $oracle_java::filename {
4+
# 8u25 - https://www.oracle.com/webfolder/s/digest/8u25checksum.html
5+
'jdk-8u25-linux-x64.rpm' : { $checksum = '6a8897b5d92e5850ef3458aa89a5e9d7' }
6+
'jdk-8u25-linux-i586.rpm' : { $checksum = '86c47648337ab32477f52f8b303c4fca' }
7+
'jdk-8u25-linux-x64.tar.gz' : { $checksum = 'e145c03a7edc845215092786bcfba77e' }
8+
'jdk-8u25-linux-i586.tar.gz' : { $checksum = 'b5b16247f66643727d9b6d4bc7c5efda' }
9+
'jre-8u25-linux-x64.rpm' : { $checksum = '96f77d62fe678a27466594ff9359eb0b' }
10+
'jre-8u25-linux-i586.rpm' : { $checksum = '53c0cbd1dc8741a16fe28ce4bc6a35a6' }
11+
'jre-8u25-linux-x64.tar.gz' : { $checksum = 'f4f7f7335eaf2e7b5ff455abece9d5ed' }
12+
'jre-8u25-linux-i586.tar.gz' : { $checksum = '22d970566c418499d331a2099d77c548' }
13+
# 8u20
14+
'jdk-8u20-linux-x64.rpm' : { $checksum = '' }
15+
'jdk-8u20-linux-i586.rpm' : { $checksum = '' }
16+
'jdk-8u20-linux-x64.tar.gz' : { $checksum = '' }
17+
'jdk-8u20-linux-i586.tar.gz' : { $checksum = '' }
18+
'jre-8u20-linux-x64.rpm' : { $checksum = '' }
19+
'jre-8u20-linux-i586.rpm' : { $checksum = '' }
20+
'jre-8u20-linux-x64.tar.gz' : { $checksum = '' }
21+
'jre-8u20-linux-i586.tar.gz' : { $checksum = '' }
22+
# 8u11
23+
'jdk-8u11-linux-x64.rpm' : { $checksum = '' }
24+
'jdk-8u11-linux-i586.rpm' : { $checksum = '' }
25+
'jdk-8u11-linux-x64.tar.gz' : { $checksum = '' }
26+
'jdk-8u11-linux-i586.tar.gz' : { $checksum = '' }
27+
'jre-8u11-linux-x64.rpm' : { $checksum = '' }
28+
'jre-8u11-linux-i586.rpm' : { $checksum = '' }
29+
'jre-8u11-linux-x64.tar.gz' : { $checksum = '' }
30+
'jre-8u11-linux-i586.tar.gz' : { $checksum = '' }
31+
# 8u5
32+
'jdk-8u5-linux-x64.rpm' : { $checksum = '' }
33+
'jdk-8u5-linux-i586.rpm' : { $checksum = '' }
34+
'jdk-8u5-linux-x64.tar.gz' : { $checksum = '' }
35+
'jdk-8u5-linux-i586.tar.gz' : { $checksum = '' }
36+
'jre-8u5-linux-x64.rpm' : { $checksum = '' }
37+
'jre-8u5-linux-i586.rpm' : { $checksum = '' }
38+
'jre-8u5-linux-x64.tar.gz' : { $checksum = '' }
39+
'jre-8u5-linux-i586.tar.gz' : { $checksum = '' }
40+
# 8u0
41+
'jdk-8-linux-x64.rpm' : { $checksum = '' }
42+
'jdk-8-linux-i586.rpm' : { $checksum = '' }
43+
'jdk-8-linux-x64.tar.gz' : { $checksum = '' }
44+
'jdk-8-linux-i586.tar.gz' : { $checksum = '' }
45+
'jre-8-linux-x64.rpm' : { $checksum = '' }
46+
'jre-8-linux-i586.rpm' : { $checksum = '' }
47+
'jre-8-linux-x64.tar.gz' : { $checksum = '' }
48+
'jre-8-linux-i586.tar.gz' : { $checksum = '' }
49+
# 7u72 - https://www.oracle.com/webfolder/s/digest/7u72checksum.html
50+
'jdk-7u72-linux-x64.rpm' : { $checksum = '' }
51+
'jdk-7u72-linux-i586.rpm' : { $checksum = '' }
52+
'jdk-7u72-linux-x64.tar.gz' : { $checksum = '' }
53+
'jdk-7u72-linux-i586.tar.gz' : { $checksum = '' }
54+
'jre-7u72-linux-x64.rpm' : { $checksum = '' }
55+
'jre-7u72-linux-i586.rpm' : { $checksum = '' }
56+
'jre-7u72-linux-x64.tar.gz' : { $checksum = '' }
57+
'jre-7u72-linux-i586.tar.gz' : { $checksum = '' }
58+
# 7u71 - https://www.oracle.com/webfolder/s/digest/7u71checksum.html
59+
'jdk-7u71-linux-x64.rpm' : { $checksum = '' }
60+
'jdk-7u71-linux-i586.rpm' : { $checksum = '' }
61+
'jdk-7u71-linux-x64.tar.gz' : { $checksum = '' }
62+
'jdk-7u71-linux-i586.tar.gz' : { $checksum = '' }
63+
'jre-7u71-linux-x64.rpm' : { $checksum = '' }
64+
'jre-7u71-linux-i586.rpm' : { $checksum = '' }
65+
'jre-7u71-linux-x64.tar.gz' : { $checksum = '' }
66+
'jre-7u71-linux-i586.tar.gz' : { $checksum = '' }
67+
# 7u67
68+
'jdk-7u67-linux-x64.rpm' : { $checksum = '' }
69+
'jdk-7u67-linux-i586.rpm' : { $checksum = '' }
70+
'jdk-7u67-linux-x64.tar.gz' : { $checksum = '' }
71+
'jdk-7u67-linux-i586.tar.gz' : { $checksum = '' }
72+
'jre-7u67-linux-x64.rpm' : { $checksum = '' }
73+
'jre-7u67-linux-i586.rpm' : { $checksum = '' }
74+
'jre-7u67-linux-x64.tar.gz' : { $checksum = '' }
75+
'jre-7u67-linux-i586.tar.gz' : { $checksum = '' }
76+
# 7u65
77+
'jdk-7u65-linux-x64.rpm' : { $checksum = '' }
78+
'jdk-7u65-linux-i586.rpm' : { $checksum = '' }
79+
'jdk-7u65-linux-x64.tar.gz' : { $checksum = '' }
80+
'jdk-7u65-linux-i586.tar.gz' : { $checksum = '' }
81+
'jre-7u65-linux-x64.rpm' : { $checksum = '' }
82+
'jre-7u65-linux-i586.rpm' : { $checksum = '' }
83+
'jre-7u65-linux-x64.tar.gz' : { $checksum = '' }
84+
'jre-7u65-linux-i586.tar.gz' : { $checksum = '' }
85+
# 7u60
86+
'jdk-7u60-linux-x64.rpm' : { $checksum = '' }
87+
'jdk-7u60-linux-i586.rpm' : { $checksum = '' }
88+
'jdk-7u60-linux-x64.tar.gz' : { $checksum = '' }
89+
'jdk-7u60-linux-i586.tar.gz' : { $checksum = '' }
90+
'jre-7u60-linux-x64.rpm' : { $checksum = '' }
91+
'jre-7u60-linux-i586.rpm' : { $checksum = '' }
92+
'jre-7u60-linux-x64.tar.gz' : { $checksum = '' }
93+
'jre-7u60-linux-i586.tar.gz' : { $checksum = '' }
94+
# 7u55
95+
'jdk-7u55-linux-x64.rpm' : { $checksum = '' }
96+
'jdk-7u55-linux-i586.rpm' : { $checksum = '' }
97+
'jdk-7u55-linux-x64.tar.gz' : { $checksum = '' }
98+
'jdk-7u55-linux-i586.tar.gz' : { $checksum = '' }
99+
'jre-7u55-linux-x64.rpm' : { $checksum = '' }
100+
'jre-7u55-linux-i586.rpm' : { $checksum = '' }
101+
'jre-7u55-linux-x64.tar.gz' : { $checksum = '' }
102+
'jre-7u55-linux-i586.tar.gz' : { $checksum = '' }
103+
# 7u51
104+
'jdk-7u51-linux-x64.rpm' : { $checksum = '' }
105+
'jdk-7u51-linux-i586.rpm' : { $checksum = '' }
106+
'jdk-7u51-linux-x64.tar.gz' : { $checksum = '' }
107+
'jdk-7u51-linux-i586.tar.gz' : { $checksum = '' }
108+
'jre-7u51-linux-x64.rpm' : { $checksum = '' }
109+
'jre-7u51-linux-i586.rpm' : { $checksum = '' }
110+
'jre-7u51-linux-x64.tar.gz' : { $checksum = '' }
111+
'jre-7u51-linux-i586.tar.gz' : { $checksum = '' }
112+
# 7u45
113+
'jdk-7u45-linux-x64.rpm' : { $checksum = '' }
114+
'jdk-7u45-linux-i586.rpm' : { $checksum = '' }
115+
'jdk-7u45-linux-x64.tar.gz' : { $checksum = '' }
116+
'jdk-7u45-linux-i586.tar.gz' : { $checksum = '' }
117+
'jre-7u45-linux-x64.rpm' : { $checksum = '' }
118+
'jre-7u45-linux-i586.rpm' : { $checksum = '' }
119+
'jre-7u45-linux-x64.tar.gz' : { $checksum = '' }
120+
'jre-7u45-linux-i586.tar.gz' : { $checksum = '' }
121+
# 7u40
122+
'jdk-7u40-linux-x64.rpm' : { $checksum = '' }
123+
'jdk-7u40-linux-i586.rpm' : { $checksum = '' }
124+
'jdk-7u40-linux-x64.tar.gz' : { $checksum = '' }
125+
'jdk-7u40-linux-i586.tar.gz' : { $checksum = '' }
126+
'jre-7u40-linux-x64.rpm' : { $checksum = '' }
127+
'jre-7u40-linux-i586.rpm' : { $checksum = '' }
128+
'jre-7u40-linux-x64.tar.gz' : { $checksum = '' }
129+
'jre-7u40-linux-i586.tar.gz' : { $checksum = '' }
130+
# 7u25
131+
'jdk-7u25-linux-x64.rpm' : { $checksum = '' }
132+
'jdk-7u25-linux-i586.rpm' : { $checksum = '' }
133+
'jdk-7u25-linux-x64.tar.gz' : { $checksum = '' }
134+
'jdk-7u25-linux-i586.tar.gz' : { $checksum = '' }
135+
'jre-7u25-linux-x64.rpm' : { $checksum = '' }
136+
'jre-7u25-linux-i586.rpm' : { $checksum = '' }
137+
'jre-7u25-linux-x64.tar.gz' : { $checksum = '' }
138+
'jre-7u25-linux-i586.tar.gz' : { $checksum = '' }
139+
# 7u21
140+
'jdk-7u21-linux-x64.rpm' : { $checksum = '' }
141+
'jdk-7u21-linux-i586.rpm' : { $checksum = '' }
142+
'jdk-7u21-linux-x64.tar.gz' : { $checksum = '' }
143+
'jdk-7u21-linux-i586.tar.gz' : { $checksum = '' }
144+
'jre-7u21-linux-x64.rpm' : { $checksum = '' }
145+
'jre-7u21-linux-i586.rpm' : { $checksum = '' }
146+
'jre-7u21-linux-x64.tar.gz' : { $checksum = '' }
147+
'jre-7u21-linux-i586.tar.gz' : { $checksum = '' }
148+
# 7u17
149+
'jdk-7u17-linux-x64.rpm' : { $checksum = '' }
150+
'jdk-7u17-linux-i586.rpm' : { $checksum = '' }
151+
'jdk-7u17-linux-x64.tar.gz' : { $checksum = '' }
152+
'jdk-7u17-linux-i586.tar.gz' : { $checksum = '' }
153+
'jre-7u17-linux-x64.rpm' : { $checksum = '' }
154+
'jre-7u17-linux-i586.rpm' : { $checksum = '' }
155+
'jre-7u17-linux-x64.tar.gz' : { $checksum = '' }
156+
'jre-7u17-linux-i586.tar.gz' : { $checksum = '' }
157+
# 7u15
158+
'jdk-7u15-linux-x64.rpm' : { $checksum = '' }
159+
'jdk-7u15-linux-i586.rpm' : { $checksum = '' }
160+
'jdk-7u15-linux-x64.tar.gz' : { $checksum = '' }
161+
'jdk-7u15-linux-i586.tar.gz' : { $checksum = '' }
162+
'jre-7u15-linux-x64.rpm' : { $checksum = '' }
163+
'jre-7u15-linux-i586.rpm' : { $checksum = '' }
164+
'jre-7u15-linux-x64.tar.gz' : { $checksum = '' }
165+
'jre-7u15-linux-i586.tar.gz' : { $checksum = '' }
166+
# 7u13
167+
'jdk-7u13-linux-x64.rpm' : { $checksum = '' }
168+
'jdk-7u13-linux-i586.rpm' : { $checksum = '' }
169+
'jdk-7u13-linux-x64.tar.gz' : { $checksum = '' }
170+
'jdk-7u13-linux-i586.tar.gz' : { $checksum = '' }
171+
'jre-7u13-linux-x64.rpm' : { $checksum = '' }
172+
'jre-7u13-linux-i586.rpm' : { $checksum = '' }
173+
'jre-7u13-linux-x64.tar.gz' : { $checksum = '' }
174+
'jre-7u13-linux-i586.tar.gz' : { $checksum = '' }
175+
# 7u11
176+
'jdk-7u11-linux-x64.rpm' : { $checksum = '' }
177+
'jdk-7u11-linux-i586.rpm' : { $checksum = '' }
178+
'jdk-7u11-linux-x64.tar.gz' : { $checksum = '' }
179+
'jdk-7u11-linux-i586.tar.gz' : { $checksum = '' }
180+
'jre-7u11-linux-x64.rpm' : { $checksum = '' }
181+
'jre-7u11-linux-i586.rpm' : { $checksum = '' }
182+
'jre-7u11-linux-x64.tar.gz' : { $checksum = '' }
183+
'jre-7u11-linux-i586.tar.gz' : { $checksum = '' }
184+
# 7u10
185+
'jdk-7u10-linux-x64.rpm' : { $checksum = '' }
186+
'jdk-7u10-linux-i586.rpm' : { $checksum = '' }
187+
'jdk-7u10-linux-x64.tar.gz' : { $checksum = '' }
188+
'jdk-7u10-linux-i586.tar.gz' : { $checksum = '' }
189+
'jre-7u10-linux-x64.rpm' : { $checksum = '' }
190+
'jre-7u10-linux-i586.rpm' : { $checksum = '' }
191+
'jre-7u10-linux-x64.tar.gz' : { $checksum = '' }
192+
'jre-7u10-linux-i586.tar.gz' : { $checksum = '' }
193+
# 7u9
194+
'jdk-7u9-linux-x64.rpm' : { $checksum = '' }
195+
'jdk-7u9-linux-i586.rpm' : { $checksum = '' }
196+
'jdk-7u9-linux-x64.tar.gz' : { $checksum = '' }
197+
'jdk-7u9-linux-i586.tar.gz' : { $checksum = '' }
198+
'jre-7u9-linux-x64.rpm' : { $checksum = '' }
199+
'jre-7u9-linux-i586.rpm' : { $checksum = '' }
200+
'jre-7u9-linux-x64.tar.gz' : { $checksum = '' }
201+
'jre-7u9-linux-i586.tar.gz' : { $checksum = '' }
202+
# 7u7
203+
'jdk-7u7-linux-x64.rpm' : { $checksum = '' }
204+
'jdk-7u7-linux-i586.rpm' : { $checksum = '' }
205+
'jdk-7u7-linux-x64.tar.gz' : { $checksum = '' }
206+
'jdk-7u7-linux-i586.tar.gz' : { $checksum = '' }
207+
'jre-7u7-linux-x64.rpm' : { $checksum = '' }
208+
'jre-7u7-linux-i586.rpm' : { $checksum = '' }
209+
'jre-7u7-linux-x64.tar.gz' : { $checksum = '' }
210+
'jre-7u7-linux-i586.tar.gz' : { $checksum = '' }
211+
# 7u6
212+
'jdk-7u6-linux-x64.rpm' : { $checksum = '' }
213+
'jdk-7u6-linux-i586.rpm' : { $checksum = '' }
214+
'jdk-7u6-linux-x64.tar.gz' : { $checksum = '' }
215+
'jdk-7u6-linux-i586.tar.gz' : { $checksum = '' }
216+
'jre-7u6-linux-x64.rpm' : { $checksum = '' }
217+
'jre-7u6-linux-i586.rpm' : { $checksum = '' }
218+
'jre-7u6-linux-x64.tar.gz' : { $checksum = '' }
219+
'jre-7u6-linux-i586.tar.gz' : { $checksum = '' }
220+
# 7u5
221+
'jdk-7u5-linux-x64.rpm' : { $checksum = '' }
222+
'jdk-7u5-linux-i586.rpm' : { $checksum = '' }
223+
'jdk-7u5-linux-x64.tar.gz' : { $checksum = '' }
224+
'jdk-7u5-linux-i586.tar.gz' : { $checksum = '' }
225+
'jre-7u5-linux-x64.rpm' : { $checksum = '' }
226+
'jre-7u5-linux-i586.rpm' : { $checksum = '' }
227+
'jre-7u5-linux-x64.tar.gz' : { $checksum = '' }
228+
'jre-7u5-linux-i586.tar.gz' : { $checksum = '' }
229+
# 7u4
230+
'jdk-7u4-linux-x64.rpm' : { $checksum = '' }
231+
'jdk-7u4-linux-i586.rpm' : { $checksum = '' }
232+
'jdk-7u4-linux-x64.tar.gz' : { $checksum = '' }
233+
'jdk-7u4-linux-i586.tar.gz' : { $checksum = '' }
234+
'jre-7u4-linux-x64.rpm' : { $checksum = '' }
235+
'jre-7u4-linux-i586.rpm' : { $checksum = '' }
236+
'jre-7u4-linux-x64.tar.gz' : { $checksum = '' }
237+
'jre-7u4-linux-i586.tar.gz' : { $checksum = '' }
238+
# 7u3
239+
'jdk-7u3-linux-x64.rpm' : { $checksum = '' }
240+
'jdk-7u3-linux-i586.rpm' : { $checksum = '' }
241+
'jdk-7u3-linux-x64.tar.gz' : { $checksum = '' }
242+
'jdk-7u3-linux-i586.tar.gz' : { $checksum = '' }
243+
'jre-7u3-linux-x64.rpm' : { $checksum = '' }
244+
'jre-7u3-linux-i586.rpm' : { $checksum = '' }
245+
'jre-7u3-linux-x64.tar.gz' : { $checksum = '' }
246+
'jre-7u3-linux-i586.tar.gz' : { $checksum = '' }
247+
# 7u2
248+
'jdk-7u2-linux-x64.rpm' : { $checksum = '' }
249+
'jdk-7u2-linux-i586.rpm' : { $checksum = '' }
250+
'jdk-7u2-linux-x64.tar.gz' : { $checksum = '' }
251+
'jdk-7u2-linux-i586.tar.gz' : { $checksum = '' }
252+
'jre-7u2-linux-x64.rpm' : { $checksum = '' }
253+
'jre-7u2-linux-i586.rpm' : { $checksum = '' }
254+
'jre-7u2-linux-x64.tar.gz' : { $checksum = '' }
255+
'jre-7u2-linux-i586.tar.gz' : { $checksum = '' }
256+
# 7u1
257+
'jdk-7u1-linux-x64.rpm' : { $checksum = '' }
258+
'jdk-7u1-linux-i586.rpm' : { $checksum = '' }
259+
'jdk-7u1-linux-x64.tar.gz' : { $checksum = '' }
260+
'jdk-7u1-linux-i586.tar.gz' : { $checksum = '' }
261+
'jre-7u1-linux-x64.rpm' : { $checksum = '' }
262+
'jre-7u1-linux-i586.rpm' : { $checksum = '' }
263+
'jre-7u1-linux-x64.tar.gz' : { $checksum = '' }
264+
'jre-7u1-linux-i586.tar.gz' : { $checksum = '' }
265+
# 7u0
266+
'jdk-7-linux-x64.rpm' : { $checksum = '' }
267+
'jdk-7-linux-i586.rpm' : { $checksum = '' }
268+
'jdk-7-linux-x64.tar.gz' : { $checksum = '' }
269+
'jdk-7-linux-i586.tar.gz' : { $checksum = '' }
270+
'jre-7-linux-x64.rpm' : { $checksum = '' }
271+
'jre-7-linux-i586.rpm' : { $checksum = '' }
272+
'jre-7-linux-x64.tar.gz' : { $checksum = '' }
273+
'jre-7-linux-i586.tar.gz' : { $checksum = '' }
274+
default : { fail("Unknown checksum for file ${oracle_java::filename}") }
275+
}
276+
}

‎manifests/download.pp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
fail('You must include the oracle_java base class before using any oracle_java sub class')
66
}
77

8+
# get checksums list
9+
include oracle_java::checksums
10+
811
# make sure install/download directory exists
912
file { '/usr/java':
1013
ensure => directory,
@@ -14,7 +17,10 @@
1417
} ->
1518
# download archive
1619
archive { "/usr/java/${oracle_java::filename}":
17-
cookie => "oraclelicense=accept-securebackup-cookie",
18-
source => $oracle_java::downloadurl
20+
cookie => "oraclelicense=accept-securebackup-cookie",
21+
source => $oracle_java::downloadurl,
22+
checksum => $oracle_java::checksums::checksum,
23+
checksum_type => 'md5',
24+
cleanup => false
1925
}
2026
}

‎manifests/init.pp‎

Lines changed: 9 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -52,81 +52,24 @@
5252
} else {
5353
$version_real = $version
5454
}
55-
56-
# get major/minor version numbers
57-
$array_version = split($version_real, 'u')
58-
$maj_version = $array_version[0]
59-
$min_version = $array_version[1]
60-
61-
# associate build number to release version
62-
case $maj_version {
63-
8 : {
64-
case $min_version {
65-
'25' : { $build = '-b17' }
66-
'20' : { $build = '-b26' }
67-
'11' : { $build = '-b12' }
68-
'5' : { $build = '-b13' }
69-
'0' : { $build = '-b132' }
70-
default : { fail("Unreleased Java SE version ${version_real}") }
71-
}
72-
}
73-
7 : {
74-
case $min_version {
75-
'72' : { $build = '-b14' }
76-
'71' : { $build = '-b14' }
77-
'67' : { $build = '-b01' }
78-
'65' : { $build = '-b17' }
79-
'60' : { $build = '-b19' }
80-
'55' : { $build = '-b13' }
81-
'51' : { $build = '-b13' }
82-
'45' : { $build = '-b18' }
83-
'40' : { $build = '-b43' }
84-
'25' : { $build = '-b15' }
85-
'21' : { $build = '-b11' }
86-
'17' : { $build = '-b02' }
87-
'15' : { $build = '-b03' }
88-
'13' : { $build = '-b20' }
89-
'11' : { $build = '-b21' }
90-
'10' : { $build = '-b18' }
91-
'9' : { $build = '-b05' }
92-
'7' : { $build = '-b10' }
93-
'6' : { $build = '-b24' }
94-
'5' : { $build = '-b06' }
95-
'4' : { $build = '-b20' }
96-
'3' : { $build = '-b04' }
97-
'2' : { $build = '-b13' }
98-
'1' : { $build = '-b08' }
99-
'0' : { $build = '' }
100-
default : { fail("Unreleased Java SE version ${version_real}") }
101-
}
102-
}
103-
default : {
104-
fail("oracle_java module does not support Java SE version ${maj_version} (yet)")
105-
}
106-
}
107-
108-
# remove extra particle if minor version is 0
109-
$version_final = delete($version_real, 'u0')
110-
$longversion = $min_version ? {
111-
'0' => "${type}1.${maj_version}.0",
112-
/^[0-9]$/ => "${type}1.${maj_version}.0_0${min_version}",
113-
default => "${type}1.${maj_version}.0_${min_version}"
114-
}
115-
55+
11656
# translate system architecture to expected value
11757
case $::architecture {
11858
/x86_64|amd64/ : { $arch = 'x64' }
11959
'x86' : { $arch = 'i586' }
12060
default : { fail("oracle_java does not support architecture ${::architecture} (yet)") }
12161
}
12262

63+
# determine build numbers, checksums, etc.
64+
include oracle_java::javalist
65+
12366
# define installer filename and download URL
124-
$filename = "${type}-${version_final}-linux-${arch}.${format_real}"
125-
$downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${version_final}${build}/${filename}"
67+
$filename = "${type}-${oracle_java::javalist::version_final}-linux-${arch}.${format_real}"
68+
$downloadurl = "http://download.oracle.com/otn-pub/java/jdk/${oracle_java::javalist::version_final}${oracle_java::javalist::build}/${filename}"
12669

12770
# define package name
128-
if $maj_version == '8' and $min_version >= '20' {
129-
$packagename = $longversion
71+
if $oracle_java::javalist::maj_version == '8' and $oracle_java::javalist::min_version >= '20' {
72+
$packagename = $oracle_java::javalist::longversion
13073
} else {
13174
$packagename = $type
13275
}
@@ -138,5 +81,5 @@
13881

13982
include oracle_java::download
14083
include oracle_java::install
141-
Class['oracle_java::download'] -> Class['oracle_java::install']
84+
Class['oracle_java::download'] ~> Class['oracle_java::install']
14285
}

0 commit comments

Comments
 (0)