X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=jpctb;h=ee1482ab97c0cffbac76e3d348abe7e2b0843c71;hb=61c9b37317a18cf120062c10db49f1b935898d3b;hp=5157a054c211afa043f6cad945361f28c1f15101;hpb=27ad770787f1e70c9ec77065aa3511b9efc71b2d;p=jarrg-ian.git

diff --git a/jpctb b/jpctb
index 5157a05..ee1482a 100755
--- a/jpctb
+++ b/jpctb
@@ -37,6 +37,7 @@ 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: $*"
@@ -80,8 +81,8 @@ fi
 yppdir="${yohoho%/*}"
 
 # this replicates the java-searching logic from yohoho/yohoho:
-if [ -x "$yohoho/java/bin/java" ]; then
-	yppjava="$yohoho/java/bin/java"
+if [ -x "$yppdir/java/bin/java" ]; then
+	yppjava="$yppdir/java/bin/java"
 elif [ -x "$JAVA_HOME/bin/java" ]; then
 	yppjava="$JAVA_HOME/bin/java"
 else
@@ -94,6 +95,7 @@ cat <<END
 jpctb:
    jpctb tree:	 "$jpctbdir"
    yohoho:       "$yohoho"
+   ypp dir:      "$yppdir"
    ypp uses:     "$yppjava"
 END
 
@@ -101,7 +103,7 @@ if ! [ -x "$yppjava" ]; then
 	nojre "bad java ypp"
 fi
 
-javadir="${yppjava#/bin/java}"
+javadir="${yppjava%/bin/java}"
 if [ -x "$javadir/jre/bin/java" ]; then
 	echo "   java/ points to the jre, good"
 else
@@ -117,11 +119,10 @@ else
 		nojre "java binary not in jre dir"
 		;;
 	esac
-	fi
 fi
 
 case "$javadir" in
-|/|/usr)	nojre "javadir is $javadir (and even found $javadir/jre!)" ;;
+''|/|/usr)	nojre "javadir is $javadir (and even found $javadir/jre!)" ;;
 /*)		;;
 *)		javadir="$PWD/$javadir" ;;
 esac
@@ -143,7 +144,19 @@ 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" ;;
+esac
+
 
 #---------- create the temporary are and link farm ----------