Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update Java version check in installMavenCentOS.sh
[transportpce.git]
/
tests
/
installMavenCentOS.sh
diff --git
a/tests/installMavenCentOS.sh
b/tests/installMavenCentOS.sh
index 35f20f84131a33fe591adcf5b1143fe6640a2bc1..a6887e7e95acdf06420138d5a115bb9606708846 100755
(executable)
--- a/
tests/installMavenCentOS.sh
+++ b/
tests/installMavenCentOS.sh
@@
-1,17
+1,17
@@
-#!/bin/
ba
sh
+#!/bin/sh
set -x
#check Java version install if any
JAVA_CMD="java"
[ -n "$JAVA_HOME" ] && JAVA_CMD="$JAVA_HOME/bin/java"
set -x
#check Java version install if any
JAVA_CMD="java"
[ -n "$JAVA_HOME" ] && JAVA_CMD="$JAVA_HOME/bin/java"
-JAVA_VER=$("$JAVA_CMD" -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*".*$/\1
\2
/p;')
+JAVA_VER=$("$JAVA_CMD" -version 2>&1 | sed -n ';s/.* version "\(.*\)\.\(.*\)\..*".*$/\1/p;')
echo $JAVA_VER
JAVAC_CMD="javac"
[ -n "$JAVA_HOME" ] && JAVAC_CMD="$JAVA_HOME/bin/javac"
echo $JAVA_VER
JAVAC_CMD="javac"
[ -n "$JAVA_HOME" ] && JAVAC_CMD="$JAVA_HOME/bin/javac"
-JAVAC_VER=$("$JAVAC_CMD" -version 2>&1 | sed -n ';s/javac \(.*\)\.\(.*\)\..*.*$/\1
\2
/p;')
+JAVAC_VER=$("$JAVAC_CMD" -version 2>&1 | sed -n ';s/javac \(.*\)\.\(.*\)\..*.*$/\1/p;')
echo $JAVAC_VER
echo $JAVAC_VER
-if [ "$JAVA_VER" -ge 1
10 -a "$JAVAC_VER" -ge 110
];then
+if [ "$JAVA_VER" -ge 1
7 -a "$JAVAC_VER" -ge 17
];then
echo "ok, java is 17 or newer"
else
#java installation for CentOS (releng OS image target)
echo "ok, java is 17 or newer"
else
#java installation for CentOS (releng OS image target)