commit 348c976d3c3f0831c1c3df40a19db7ed3f0e045b
author Michael Blow <mblow@apache.org> Mon Jun 11 12:09:39 2018 -0400
committer Michael Blow <mblow@apache.org> Fri Jun 15 11:37:22 2018 -0700
tree 3cbec09d63fb249a26cbfd091f96cb19e5e95dfa
parent bc6a6c5b27a68f9e4a743e7e47578237935ee982

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

(cherry picked from commit 4dad013297f033e7aaa83fbf72fa11eaada7f927)

Change-Id: I3a03eba1c970d1f8c7d27f93dc4e7336a24800ea
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2701
Reviewed-by: Till Westmann <tillw@apache.org>
Tested-by: Michael Blow <mblow@apache.org>

asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh

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 f7e0e34..944351d 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
@@ -39,15 +39,15 @@
   export JAVA_HOME
 fi
 
-[ -z "$JAVA_HOME" ] && {
-  echo "JAVA_HOME not set"
-  exit 1
-}
-"$JAVA_HOME/bin/java" -version 2>&1 | grep -q '1\.[89]' || {
-  echo "JAVA_HOME must be at version 1.8 or later:"
-  "$JAVA_HOME/bin/java" -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"