diff options
| author | Jiri Vanek <[email protected]> | 2013-05-20 16:22:44 +0200 |
|---|---|---|
| committer | Jiri Vanek <[email protected]> | 2013-05-20 16:22:44 +0200 |
| commit | e1f7e03f7f2778432f43b6ebfc9c4a71398d9fa7 (patch) | |
| tree | 674b2c8740aa9dcabfeb229e8d8e26bfa66c4cba /launcher | |
| parent | 0807c9fc6f5b44323c53413341eb4026de919ff6 (diff) | |
Synchronized launchers to be from one source
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/itweb-settings.in | 29 | ||||
| -rw-r--r-- | launcher/launchers.in (renamed from launcher/javaws.in) | 8 |
2 files changed, 4 insertions, 33 deletions
diff --git a/launcher/itweb-settings.in b/launcher/itweb-settings.in deleted file mode 100644 index 8b8905d..0000000 --- a/launcher/itweb-settings.in +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -JAVA=@JAVA@ -LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ -LAUNCHER_FLAGS=-Xms8m -CLASSNAME=net.sourceforge.jnlp.controlpanel.CommandLine -BINARY_LOCATION=@ITWEB_SETTINGS_BIN_LOCATION@ -PROGRAM_NAME=itweb-settings - -PROPERTY_NAME=deployment.jre.dir -CUSTOM_JRE_REGEX="^$PROPERTY_NAME *= *" -CUSTOM_JRE=`grep "$CUSTOM_JRE_REGEX" ~/.icedtea/deployment.properties 2>/dev/null | sed "s/$CUSTOM_JRE_REGEX//g"` -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 [ -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." - fi -fi; - -${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \ - -Dicedtea-web.bin.name=${PROGRAM_NAME} \ - -Dicedtea-web.bin.location=${BINARY_LOCATION} \ - ${CLASSNAME} \ - $@ - diff --git a/launcher/javaws.in b/launcher/launchers.in index 2f003a9..008a4db 100644 --- a/launcher/javaws.in +++ b/launcher/launchers.in @@ -3,10 +3,10 @@ JAVA=@JAVA@ LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@ LAUNCHER_FLAGS=-Xms8m -CLASSNAME=net.sourceforge.jnlp.runtime.Boot -BINARY_LOCATION=@JAVAWS_BIN_LOCATION@ +CLASSNAME=@MAIN_CLASS@ +BINARY_LOCATION=@BIN_LOCATION@ SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@ -PROGRAM_NAME=javaws +PROGRAM_NAME=@PROGRAM_NAME@ CP=@JRE@/lib/rt.jar PROPERTY_NAME=deployment.jre.dir @@ -86,6 +86,6 @@ while [ "$j" -lt "${#ARGS[@]}" ]; do k=$((k+1)) done -exec -a "javaws" "${COMMAND[@]}" +exec -a "$PROGRAM_NAME" "${COMMAND[@]}" exit $? |