Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 2061d05

Browse files
committed
[refactoring] quoting and comments in extractJavaMajorVersion()
1 parent 8dd70f1 commit 2061d05

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/universalJavaApplicationStub

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,11 @@ function extractJavaVersionString() {
323323
##########################################################
324324
function extractJavaMajorVersion() {
325325
java_ver=$1
326-
# Java 6, 7, 8 starts with 1.x
327-
if [ ${java_ver:0:2} == "1." ] ; then
328-
echo ${java_ver} | sed -E 's/1\.([0-9])[0-9_.]{2,6}/\1/g'
326+
# Java 6, 7, 8 start with '1.x'
327+
if [ "${java_ver:0:2}" == "1." ] ; then
328+
echo ${java_ver} | sed -E 's/1\.([0-8])[0-9_.]{2,6}/\1/g'
329329
else
330-
# Java 9+ starts with x using semver versioning
330+
# Java 9+ start with 'x' using semver versioning
331331
echo ${java_ver} | sed -E 's/([0-9]+)(-ea|(\.[0-9]+)*)/\1/g'
332332
fi
333333
}

test/java-version-tester.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ function extractJavaVersionString() {
2424
##########################################################
2525
function extractJavaMajorVersion() {
2626
java_ver=$1
27-
# Java 6, 7, 8 starts with 1.x
27+
# Java 6, 7, 8 start with '1.x'
2828
if [ "${java_ver:0:2}" == "1." ] ; then
29-
echo ${java_ver} | sed -E 's/1\.([0-9])[0-9_.]{2,6}/\1/g'
29+
echo ${java_ver} | sed -E 's/1\.([0-8])[0-9_.]{2,6}/\1/g'
3030
else
31-
# Java 9+ starts with x using semver versioning
31+
# Java 9+ start with 'x' using semver versioning
3232
echo ${java_ver} | sed -E 's/([0-9]+)(-ea|(\.[0-9]+)*)/\1/g'
3333
fi
3434
}

0 commit comments

Comments
 (0)