/hg/icedtea-web: fix broken -J command line arguments

omajid at icedtea.classpath.org omajid at icedtea.classpath.org
Mon Mar 28 12:09:07 PDT 2011


changeset c04136b79d4a in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=c04136b79d4a
author: Omair Majid <omajid at redhat.com>
date: Mon Mar 28 15:08:39 2011 -0400

	fix broken -J command line arguments

	2011-03-28 Omair Majid <omajid at redhat.com>

	 * launcher/javaws.in: Split out -J arguments and pass it to the
	JVM.


diffstat:

 ChangeLog          |   4 ++++
 launcher/javaws.in |  20 +++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 331d5d580cc4 -r c04136b79d4a ChangeLog
--- a/ChangeLog	Mon Mar 28 13:41:16 2011 -0400
+++ b/ChangeLog	Mon Mar 28 15:08:39 2011 -0400
@@ -1,3 +1,7 @@
+2011-03-28  Omair Majid  <omajid at redhat.com>
+
+	* launcher/javaws.in: Split out -J arguments and pass it to the JVM.
+
 2011-03-28  Deepak Bhole <dbhole at redhat.com>
 
 	* netx/net/sourceforge/jnlp/PluginBridge.java
diff -r 331d5d580cc4 -r c04136b79d4a launcher/javaws.in
--- a/launcher/javaws.in	Mon Mar 28 13:41:16 2011 -0400
+++ b/launcher/javaws.in	Mon Mar 28 15:08:39 2011 -0400
@@ -7,8 +7,26 @@
 BINARY_LOCATION=@JAVAWS_BIN_LOCATION@
 PROGRAM_NAME=javaws
 
+JAVA_ARGS=
+ARGS=
+
+while [ "$#" -gt "0" ]; do
+  case "$1" in
+    -J*)
+      JAVA_ARGS="${JAVA_ARGS} ${1##-J}"
+      ;;
+    *)
+      ARGS="${ARGS} $1"
+      ;;
+  esac
+  shift
+done
+
 ${JAVA} ${LAUNCHER_BOOTCLASSPATH} ${LAUNCHER_FLAGS} \
+  ${JAVA_ARGS} \
   -Dicedtea-web.bin.name=${PROGRAM_NAME} \
   -Dicedtea-web.bin.location=${BINARY_LOCATION} \
   ${CLASSNAME} \
-  $@
+  ${ARGS}
+
+exit $?



More information about the distro-pkg-dev mailing list