From e8114d6839c34cb6d3f0167989757089519756e7 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 25 Aug 2010 00:16:23 +0100
Subject: [PATCH] jpctb: cope if java binary is in jre1.yada

---
 jpctb | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/jpctb b/jpctb
index 54c1f41..3557cd2 100755
--- a/jpctb
+++ b/jpctb
@@ -124,13 +124,19 @@ else
 	absjava=`readlink -f "$yppjava"`
 	echo "   abs. java:    \"$absjava\""
 	case "$absjava" in
-	*/jre/bin/java)
-		echo "   found jre directory, good"
-		javadir="${absjava%/jre/bin/java}"
+	*/*/bin/java)
+		javadir="${absjava%/bin/java}"
+		jreleaf="${javadir##*/}"
+		javadir="${javadir%/*}"
+		echo "   jre leaf dir: \"$jreleaf\""
+		case "$jreleaf" in
+		jre)	echo "   found jre directory, good";;
+		jre1.*)	echo "   found versioned jre directory $jreleaf, ok";;
+		*)	nojre "java binary not in jre dir ($jreleaf)";;
+		esac
 		;;
 	*)
-		nojre "java binary not in jre dir"
-		;;
+		nojre "real java binary not in ../bin/java dir";;
 	esac
 fi
 
@@ -144,7 +150,7 @@ jtmp="$jpctbdir/tmp"
 linkfarm="$jtmp/linkfarm"
 extdir="$jtmp/ext"
 
-export JPCTB_JRE="$javadir/jre"
+export JPCTB_JRE="$javadir/$jreleaf"
 
 #---------- confirm for the user which paths we're using ----------
 
@@ -185,7 +191,7 @@ cp -Rs "$javadir"/. "$linkfarm"/.
 
 #---------- edit the linkfarm to have our jvm wrapper ----------
 
-wrapper="$linkfarm"/jre/bin/java
+wrapper="$linkfarm"/$jreleaf/bin/java
 rm -- "$wrapper"
 
 export JPCTB_EXTDIR="$extdir"
@@ -234,4 +240,4 @@ chmod +x -- "$wrapper"
 
 #---------- now run it ----------
 
-exec $setup_only_simulate "$yohoho" -Djava.home="$linkfarm/jre"
+exec $setup_only_simulate "$yohoho" -Djava.home="$linkfarm/$jreleaf"
-- 
2.30.2