X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=jpctb;h=c5bf4aae20fc2034772a8046b68d4a637f103f2b;hb=2f9d258269d321a48fc20919811bf944cc099248;hp=8b61ed8942f655246b9ac7ff42cea09c40f7655a;hpb=afbe2cc2cc040e051ee1f55be352db0bf319a8e1;p=jarrg-ian.git

diff --git a/jpctb b/jpctb
index 8b61ed8..c5bf4aa 100755
--- a/jpctb
+++ b/jpctb
@@ -24,7 +24,7 @@
 
 
 usage () { cat <<END
-usage: .../jpctb /path/to/dir/with/PCTB*.jar /path/to/yohoho/yohoho [...]
+usage: .../jpctb /path/to/yohoho/yohoho [...]
 END
 }
 
@@ -73,15 +73,56 @@ fi
 
 yppdir="${yohoho%/*}"
 
+cat <<END
+jpctb:
+   jpctb tree:	 "$jpctbdir"
+   yohoho:       "$yohoho"
+END
+
 if [ -x "$yppdir/java/bin/java" ]; then
-	javadir="$yppdir/java"
-elif [ x"$JAVA_HOME" != x ] && [ -x "$JAVA_HOME/bin/java" ]; then
-	javadir="$JAVA_HOME"
-else
-	fail "could not find java runtime system"
+	if [ -d "$yppdir/java/jre" ]; then
+		echo "   yohoho/java/bin and yohoho/java/jre exist, good"
+		javadir="$yppdir/java"
+	else
+		absjava=`readlink -f "$yppdir/java/bin/java"`
+		cat <<END
+   yohoho/java/bin exists but yohoho/java/jre does not
+   abs. java:    "$absjava"
+END
+		case "$absjava" in
+		*/jre/bin/java)
+			echo "   found jre directory, good"
+			javadir="${absjava%/jre/bin/java}"
+			;;
+		*)
+			echo "   java binary not in jre dir as expected, hmm."
+			;;
+		esac
+	fi
+fi
+
+if [ "x$javadir" = x ] && [ x"$JAVA_HOME" != x ] && \
+   [ -x "$JAVA_HOME/bin/java" ]; then
+cat <<END
+   yohoho/java/bin/java nonexistent or unsuitable, trying JAVA_HOME"
+   JAVA_HOME:    "$JAVA_HOME"
+END
+	if [ -d "$JAVA_HOME/jre" ]; then
+		javadir="$JAVA_HOME"
+	else
+		echo "   JAVA_HOME has no jre subdirectory, hmm."
+	fi
+fi
+
+if [ "x$javadir" = x ]; then
+	fail "could not find java runtime system
+ please check that $yppdir/java points to your Java installation"
 fi
 
 case "$javadir" in
+/usr)	fail "javadir is still /usr (and even found /usr/jre!)
+ please make $yppdir/java point somewhere more sensible and/or
+ reinstall YPP not telling it your java is in /usr.  sorry." ;;
 /*)	;;
 *)	javadir="$PWD/$javadir" ;;
 esac
@@ -90,13 +131,13 @@ jtmp="$jpctbdir/tmp"
 linkfarm="$jtmp/linkfarm"
 extdir="$jtmp/ext"
 
+export JPCTB_JRE="$javadir/jre"
+
 #---------- confirm for the user which paths we're using ----------
 
 cat <<END
-jpctb:
-   jpctb tree:	 "$jpctbdir"
-   yohoho:       "$yohoho"
    java:         "$javadir"
+   JRE:          "$JPCTB_JRE"
    PCTB jars:    "$srcjardir"
    jpctb tmpdir: "$jtmp"
 END
@@ -111,7 +152,7 @@ rm -rf -- "$jtmp"
 mkdir -- "$jtmp" "$extdir" "$linkfarm"
 cp "$srcjardir"/PCTB*.jar "$extdir"
 
-lndir -silent "$javadir" "$linkfarm"
+cp -Rs "$javadir"/. "$linkfarm"/.
 
 #---------- edit the linkfarm to have our jvm wrapper ----------
 
@@ -119,7 +160,6 @@ wrapper="$linkfarm"/jre/bin/java
 rm -- "$wrapper"
 
 export JPCTB_EXTDIR="$extdir"
-export JPCTB_JRE="$javadir/jre"
 
 cat <<'END' >"$wrapper"
 #!/bin/bash