# HG changeset patch
# User Jiri Vanek <jvanek@redhat.com>
# Date 1551286049 -3600
# Node ID 120ed7532028cc1f1a690ebf3c8d26040f11e7e0
# Parent  a2a8f9a1d946b202e31b8b49182ffb843e978fd2
shell launcher got support for JAVA_HOME
* shell-launcher/launchers.sh.in: if JAVA_HOME is detected, is used as most pre

diff -r a2a8f9a1d946 -r 120ed7532028 ChangeLog
--- a/ChangeLog	Mon Feb 25 11:58:32 2019 +0100
+++ b/ChangeLog	Wed Feb 27 17:47:29 2019 +0100
@@ -1,3 +1,8 @@
+2019-02-27  Jiri Vanek <jvanek@redhat.com>
+
+	shell launcher got support for JAVA_HOME
+	* shell-launcher/launchers.sh.in: if JAVA_HOME is detected, is used as most preferred
+
 2019-02-25  Olesya Gerasimenko <gammaray@basealt.ru>
 
 	Updated Russian translation
diff -r a2a8f9a1d946 -r 120ed7532028 shell-launcher/launchers.sh.in
--- a/shell-launcher/launchers.sh.in	Mon Feb 25 11:58:32 2019 +0100
+++ b/shell-launcher/launchers.sh.in	Wed Feb 27 17:47:29 2019 +0100
@@ -2,6 +2,7 @@
 
 NASHORN=lib/ext/nashorn.jar
 JRE=@JRE@
+#unused
 JAVA=$JRE/bin/java
 LAUNCHER_BOOTCLASSPATH='@LAUNCHER_BOOTCLASSPATH@'
 LAUNCHER_FLAGS=-Xms8m
@@ -51,6 +52,10 @@
 if [ "x$CUSTOM_JRE" = "x" ] ; then
   CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" /etc/.java/.deploy/deployment.properties 2>/dev/null |  sed "s/$CUSTOM_JRE_REGEX//g"`
 fi;
+if [ ! "x$JAVA_HOME" = "x" ] ; then
+  echo "Warning! JAVA_HOME of $JAVA_HOME in play!"
+  CUSTOM_JRE=$JAVA_HOME
+fi
 
 
 # Support portable ITW:
@@ -82,7 +87,7 @@
     CP=$CUSTOM_JRE/lib/rt.jar:$CUSTOM_JRE/lib/jfxrt.jar
     LAUNCHER_BOOTCLASSPATH=$LAUNCHER_BOOTCLASSPATH:$CUSTOM_JRE/$NASHORN
   else
-    echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA, $CP) in attempt to start. Please fix this."
+    echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JRE, $CP) in attempt to start. Please fix this."
   fi
 else
   LAUNCHER_BOOTCLASSPATH="$LAUNCHER_BOOTCLASSPATH:$JRE/$NASHORN"