You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/06/18 21:09:32 UTC
[02/10] asterixdb git commit: [ASTERIXDB-2397][*DB] Fix sample
cluster on Java 10
[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 <ti...@apache.org>
Tested-by: Michael Blow <mb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/348c976d
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/348c976d
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/348c976d
Branch: refs/heads/master
Commit: 348c976d3c3f0831c1c3df40a19db7ed3f0e045b
Parents: bc6a6c5
Author: Michael Blow <mb...@apache.org>
Authored: Mon Jun 11 12:09:39 2018 -0400
Committer: Michael Blow <mb...@apache.org>
Committed: Fri Jun 15 11:37:22 2018 -0700
----------------------------------------------------------------------
.../src/main/opt/local/bin/start-sample-cluster.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/348c976d/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 @@ if [ -z "$JAVA_HOME" -a -x /usr/libexec/java_home ]; then
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"