changeset 170:387a6530ff43

Bug 3214: heapstats-cli should check JAVA_HOME value Reviewed-by: yasuenag GitHub: https://github.com/HeapStats/heapstats/pull/45
author KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
date Tue, 01 Nov 2016 09:46:46 +0900
parents dbe9ae2813ac
children 00afdf817f77
files ChangeLog analyzer/cli/heapstats-cli.in
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Oct 19 16:39:08 2016 +0900
+++ b/ChangeLog	Tue Nov 01 09:46:46 2016 +0900
@@ -1,3 +1,7 @@
+2016-10-31  KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
+
+	* Bug 3214: heapstats-cli should check JAVA_HOME value
+
 2016-10-19  KUBOTA Yuji <kubota.yuji@lab.ntt.co.jp>
 
 	* Bug 3197: Add a validation of reftree_fontsize
--- a/analyzer/cli/heapstats-cli.in	Wed Oct 19 16:39:08 2016 +0900
+++ b/analyzer/cli/heapstats-cli.in	Tue Nov 01 09:46:46 2016 +0900
@@ -6,5 +6,11 @@
 
 CLI_JAR="$libexecdir/heapstats-cli.jar"
 
-$JAVA_HOME/bin/java $JAVA_OPTS -jar $CLI_JAR $@
+if test -x $JAVA_HOME/bin/java; then
+  $JAVA_HOME/bin/java $JAVA_OPTS -jar $CLI_JAR $@
+elif test -z "$JAVA_HOME"; then
+  echo "Set \$JAVA_HOME to run heapstats-cli"
+else
+  echo "Set \$JAVA_HOME correctly to run heapstats-cli"
+fi