X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=jarrg-owen.git;a=blobdiff_plain;f=jpctb;h=ee1482ab97c0cffbac76e3d348abe7e2b0843c71;hp=ee8ff628f2a77bfcd3a69fc15e1cbeeec7b6857a;hb=cd2e9f3c4de1504948756b4187ed6f0fc9b07280;hpb=d261d8017da83e00b790beff084329a37c8cd617

diff --git a/jpctb b/jpctb
index ee8ff62..ee1482a 100755
--- a/jpctb
+++ b/jpctb
@@ -103,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
@@ -144,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 ----------