installer no longer phones home (!)

[jarrg-owen.git] / jpctb

diff --git a/jpctb b/jpctb
index ee8ff628f2a77bfcd3a69fc15e1cbeeec7b6857a..c4f2b6e6a241035ebc7f891765b2e5269676af50 100755 (executable)
--- 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"; exit "$rc" ;;
+esac
+
 
 #---------- create the temporary are and link farm ----------