Michael Blow has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/2695

Change subject: [ASTERIXDB-2397][*DB] Fix sample cluster on Java 10
......................................................................

[ASTERIXDB-2397][*DB] Fix sample cluster on Java 10

Change-Id: Ie40107e1f402e977413127783f51dc3a91dad2d2
---
M asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
1 file changed, 8 insertions(+), 4 deletions(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/95/2695/1

diff --git 
a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh 
b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index 4f3caed..d1699dd 100755
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@ -86,11 +86,15 @@
   fi
 fi
 
-"$JAVACMD" -version 2>&1 | grep -q '1\.[89]' || {
-  echo "JAVA_HOME must be at version 1.8 or later:"
-  "$JAVACMD" -version
+export JAVA_VERSION=$(java -version 2>&1 | head -1 | awk '{ print $NF }' | tr 
-d '"')
+case $JAVA_VERSION in
+  1.8*|1.9*|10*|11*)
+    ;;
+  *)
+  echo JAVA_HOME must be at version 1.8 or later, but is: $JAVA_VERSION
   exit 2
-}
+esac
+
 DIRNAME=$(dirname "$0")
 [ $(echo $DIRNAME | wc -l) -ne 1 ] && {
   echo "Paths with spaces are not supported"

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/2695
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie40107e1f402e977413127783f51dc3a91dad2d2
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>

Reply via email to