[pkg-java] r6397 - in trunk/java-wrappers: . debian tests

[fourmond at alioth.debian.org]

Author: fourmond
Date: 2008-05-03 07:31:45 +0000 (Sat, 03 May 2008)
New Revision: 6397

Added:
   trunk/java-wrappers/tests/
   trunk/java-wrappers/tests/find_runtime.sh
Modified:
   trunk/java-wrappers/debian/changelog
   trunk/java-wrappers/java-wrappers.sh
Log:
[java-wrappers] Fix the pattern problem when JAVA_HOME is missing

Modified: trunk/java-wrappers/debian/changelog
===================================================================
--- trunk/java-wrappers/debian/changelog	2008-05-02 16:50:13 UTC (rev 6396)
+++ trunk/java-wrappers/debian/changelog	2008-05-03 07:31:45 UTC (rev 6397)
@@ -1,3 +1,10 @@
+java-wrappers (0.1.5) unstable; urgency=low
+
+  * Fix the pattern for conjuring up a JAVA_HOME when it is missing. 
+    (closes: #478054)
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 03 May 2008 09:30:16 +0200
+
 java-wrappers (0.1.4) unstable; urgency=low
 
   * Improved find_java_runtime to take several arguments

Modified: trunk/java-wrappers/java-wrappers.sh
===================================================================
--- trunk/java-wrappers/java-wrappers.sh	2008-05-02 16:50:13 UTC (rev 6396)
+++ trunk/java-wrappers/java-wrappers.sh	2008-05-03 07:31:45 UTC (rev 6397)
@@ -252,7 +252,7 @@
     # is absent. Idea coming from bug #404728.
     if [ -z "$JAVA_HOME" ]; then
 	full_cmd_path="$(readlink -f `which $JAVA_CMD`)"
-	JAVA_HOME="${full_cmd_path:bin/*}"
+	JAVA_HOME="${full_cmd_path%bin/*}"
 	java_debug "Using JAVA_CMD to find JAVA_HOME = '$JAVA_HOME'"
     fi
     if [ "$FORCE_CLASSPATH" ]; then

Added: trunk/java-wrappers/tests/find_runtime.sh
===================================================================
--- trunk/java-wrappers/tests/find_runtime.sh	                        (rev 0)
+++ trunk/java-wrappers/tests/find_runtime.sh	2008-05-03 07:31:45 UTC (rev 6397)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# find_runtime.sh: A small test script for find_java_runtime
+# copyright 2008 by Vincent Fourmond.
+# Distributed under the same terms as java-wrappers itself.
+
+DEBUG_WRAPPER=1
+. ../java-wrappers.sh
+
+find_java_runtime 
+
+echo $JAVA_HOME
\ No newline at end of file