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
jpctb:
jpctb tree: "$jpctbdir"
yohoho: "$yohoho"
+ ypp dir: "$yppdir"
ypp uses: "$yppjava"
END
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
#---------- 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 ----------