Mercurial > hg > release > icedtea-web-1.7
changeset 1527:ea6f73e2fe47
shell launcher got support for JAVA_HOME
* shell-launcher/launchers.sh.in: if JAVA_HOME is detected, is used as most pre
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Mon, 04 Mar 2019 16:09:30 +0100 |
| parents | 3ce19ba2d7b3 |
| children | c49a02a87fab |
| files | ChangeLog launcher/launchers.sh.in |
| diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 04 15:59:35 2019 +0100 +++ b/ChangeLog Mon Mar 04 16:09:30 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
--- a/launcher/launchers.sh.in Mon Mar 04 15:59:35 2019 +0100 +++ b/launcher/launchers.sh.in Mon Mar 04 16:09:30 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"