UI fixes: jpctb does not run ypp if user closes the control panel; remove option...

[jarrg-owen.git] / jpctb

diff --git a/jpctb b/jpctb
index 7cca6dfb09bb0fad97693a3bc542ae8696544c5a..ee1482ab97c0cffbac76e3d348abe7e2b0843c71 100755 (executable)
--- a/jpctb
+++ b/jpctb
@@ -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 ----------