X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-owen.git;a=blobdiff_plain;f=jpctb;h=c4f2b6e6a241035ebc7f891765b2e5269676af50;hp=28f71c114110dc25bb4a183b4c0d0c7e1808b9b5;hb=refs%2Fheads%2Fmaster;hpb=cde26335b1868186951809ced9700fa9ec4d9dba

diff --git a/jpctb b/jpctb
index 28f71c1..c4f2b6e 100755
--- a/jpctb
+++ b/jpctb
@@ -32,6 +32,13 @@ fail () {
 	echo >&2 "jpctb: $*"
 	exit 127
 }
+
+nojre () {
+	fail "couldn't find the right jre: $*
+ perhaps you should make ypp's java symlink (normally yohoho/java)
+ point to your jre, eg to /usr/lib/jvm/java-6-sun"
+}
+
 badusage () {
 	fail "bad usage: $*"
 }
@@ -73,37 +80,83 @@ fi
 
 yppdir="${yohoho%/*}"
 
+# this replicates the java-searching logic from yohoho/yohoho:
 if [ -x "$yppdir/java/bin/java" ]; then
-	javadir="$yppdir/java"
-elif [ x"$JAVA_HOME" != x ] && [ -x "$JAVA_HOME/bin/java" ]; then
-	javadir="$JAVA_HOME"
+	yppjava="$yppdir/java/bin/java"
+elif [ -x "$JAVA_HOME/bin/java" ]; then
+	yppjava="$JAVA_HOME/bin/java"
 else
-	fail "could not find java runtime system"
+	set +e
+	yppjava=`type -p java 2>&1`
+	set -e
+fi
+
+cat <<END
+jpctb:
+   jpctb tree:	 "$jpctbdir"
+   yohoho:       "$yohoho"
+   ypp dir:      "$yppdir"
+   ypp uses:     "$yppjava"
+END
+
+if ! [ -x "$yppjava" ]; then
+	nojre "bad java ypp"
+fi
+
+javadir="${yppjava%/bin/java}"
+if [ -x "$javadir/jre/bin/java" ]; then
+	echo "   java/ points to the jre, good"
+else
+	echo "   java/ has just the executable bin/java, trying readlink"
+	absjava=`readlink -f "$yppjava"`
+	echo "   abs. java:    \"$absjava\""
+	case "$absjava" in
+	*/jre/bin/java)
+		echo "   found jre directory, good"
+		javadir="${absjava%/jre/bin/java}"
+		;;
+	*)
+		nojre "java binary not in jre dir"
+		;;
+	esac
 fi
 
 case "$javadir" in
-/*)	;;
-*)	javadir="$PWD/$javadir" ;;
+''|/|/usr)	nojre "javadir is $javadir (and even found $javadir/jre!)" ;;
+/*)		;;
+*)		javadir="$PWD/$javadir" ;;
 esac
 
 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
 
 #---------- run the control panel ----------
 
-"$javadir/bin/java" -jar "$srcjardir/PCTB-ControlPanel.jar"
+set +e
+"$javadir/bin/java" \
+ -Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
+ -jar "$srcjardir/PCTB-ControlPanel.jar"
+rc=$?
+set -e
+
+case $rc in
+0)	echo "launcher dialogue closed, quitting"; exit 0 ;;
+12)	;;
+*)	echo >&2 "control panel failed with exit status $rc"; exit "$rc" ;;
+esac
+
 
 #---------- create the temporary are and link farm ----------
 
@@ -111,7 +164,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 +172,6 @@ wrapper="$linkfarm"/jre/bin/java
 rm -- "$wrapper"
 
 export JPCTB_EXTDIR="$extdir"
-export JPCTB_JRE="$javadir/jre"
 
 cat <<'END' >"$wrapper"
 #!/bin/bash