diff options
| author | Jiri Vanek <[email protected]> | 2013-04-12 13:31:49 +0200 |
|---|---|---|
| committer | Jiri Vanek <[email protected]> | 2013-04-12 13:31:49 +0200 |
| commit | 2f1248e599ff30dc01d6d1d7361fc0f4331a1b68 (patch) | |
| tree | 84e64629330eda098b217309ccc2af14b30a16db /launcher | |
| parent | d72aa240b794c81d4ec9aea24158564e696173a9 (diff) | |
Added dialogue to allow setting of custom JRE
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/itweb-settings.in | 2 | ||||
| -rw-r--r-- | launcher/javaws.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/launcher/itweb-settings.in b/launcher/itweb-settings.in index b719ec3..8b8905d 100644 --- a/launcher/itweb-settings.in +++ b/launcher/itweb-settings.in @@ -14,7 +14,7 @@ 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$CUSTOM_JRE" != "x" ] ; then - if [ -d "$CUSTOM_JRE" -a -f "$CUSTOM_JRE/bin/java" ] ; then + if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" ] ; then JAVA=$CUSTOM_JRE/bin/java else echo "Your custom JRE $CUSTOM_JRE read from deployment.properties under key $PROPERTY_NAME as $CUSTOM_JRE is not valid. Using default ($JAVA) in attempt to start. Please fix this." diff --git a/launcher/javaws.in b/launcher/javaws.in index b7352c8..2f003a9 100644 --- a/launcher/javaws.in +++ b/launcher/javaws.in @@ -16,7 +16,7 @@ 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$CUSTOM_JRE" != "x" ] ; then - if [ -d "$CUSTOM_JRE" -a -f "$CUSTOM_JRE/bin/java" -a -f "$CUSTOM_JRE/lib/rt.jar" ] ; then + if [ -e "$CUSTOM_JRE" -a -e "$CUSTOM_JRE/bin/java" -a -e "$CUSTOM_JRE/lib/rt.jar" ] ; then JAVA=$CUSTOM_JRE/bin/java CP=$CUSTOM_JRE/lib/rt.jar else |