[cp-patches] FYI: use @VM_BINARY@ with jarsigner and keytool scripts

[Raif S. Naffah]

hello all,

the attached patch --already committed-- use @VM_BINARY@, instead of 
$JAVA in jarsigner and keytool launcher scripts.

2006-06-02  Raif S. Naffah  <[EMAIL PROTECTED]>

        * tools/jarsigner.in: Use @[EMAIL PROTECTED]
        * tools/keytool.in: Likewise.


cheers;
rsn

Index: keytool.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/keytool.in,v
retrieving revision 1.1
diff -u -r1.1 keytool.in
--- keytool.in	6 May 2006 01:05:04 -0000	1.1
+++ keytool.in	1 Jun 2006 19:15:57 -0000
@@ -44,20 +44,4 @@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-# find the java executable...
-if [ -z "${JAVA}" ] ; then
-  if [ -n "${JAVA_HOME}" ] ; then
-    if [ -x "${JAVA_HOME}/jre/sh/java" ] ; then
-      JAVA="${JAVA_HOME}/jre/sh/java"
-    else
-      JAVA="${JAVA_HOME}/bin/java"
-    fi
-  else
-    JAVA=`which java 2> /dev/null `
-    if [ -z "${JAVA}" ] ; then
-        JAVA=java
-    fi
-  fi
-fi
-
-exec "${JAVA}" -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.keytool.Main $@
+exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.keytool.Main $@
Index: jarsigner.in
===================================================================
RCS file: /cvsroot/classpath/classpath/tools/jarsigner.in,v
retrieving revision 1.1
diff -u -r1.1 jarsigner.in
--- jarsigner.in	6 May 2006 01:05:04 -0000	1.1
+++ jarsigner.in	1 Jun 2006 19:16:41 -0000
@@ -44,20 +44,4 @@
 [EMAIL PROTECTED]@/@PACKAGE@
 tools_cp=${tools_dir}/tools.zip
 
-# find the java executable...
-if [ -z "${JAVA}" ] ; then
-  if [ -n "${JAVA_HOME}" ] ; then
-    if [ -x "${JAVA_HOME}/jre/sh/java" ] ; then
-      JAVA="${JAVA_HOME}/jre/sh/java"
-    else
-      JAVA="${JAVA_HOME}/bin/java"
-    fi
-  else
-    JAVA=`which java 2> /dev/null `
-    if [ -z "${JAVA}" ] ; then
-        JAVA=java
-    fi
-  fi
-fi
-
-exec "${JAVA}" -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.jarsigner.Main $@
+exec @VM_BINARY@ -Xbootclasspath/p:"${tools_cp}" gnu.classpath.tools.jarsigner.Main $@

pgpK63a3rCuss.pgp
Description: PGP signature