Skip to content

Commit 61e7ffc

Browse files
sdarlingtonalamar
authored andcommitted
IGNITE-9836 Java version check can now deal with letter suffixes - Fixes apache#6920.
Signed-off-by: Ilya Kasnacheev <[email protected]>
1 parent 538a46b commit 61e7ffc

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

bin/include/functions.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,7 @@ javaMajorVersion() {
4646
if [ ${version} -eq 1 ]; then
4747
# Version seems starts from 1, we need second number.
4848
javaVersion "$1"
49-
backIFS=$IFS
50-
51-
IFS=. ver=(${version##*-})
52-
version=${ver[1]}
53-
54-
IFS=$backIFS
49+
version=$(awk -F[\"\.] '{print $2}' <<< ${version})
5550
fi
5651
}
5752

modules/web-console/web-agent/bin/include/functions.sh

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,7 @@ javaMajorVersion() {
4040
if [ ${version} -eq 1 ]; then
4141
# Version seems starts from 1, we need second number.
4242
javaVersion "$1"
43-
backIFS=$IFS
44-
45-
IFS=. ver=(${version##*-})
46-
version=${ver[1]}
47-
48-
IFS=$backIFS
43+
version=$(awk -F[\"\.] '{print $2}' <<< ${version})
4944
fi
5045
}
5146

0 commit comments

Comments
 (0)