From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 25 Aug 2010 21:58:52 +0000 (+0100)
Subject: invoke std java for control panel via jre directory
X-Git-Tag: 0.9.4^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;ds=sidebyside;h=5647e8560539af98593f829398762bb6f56aac0d;p=jarrg-ian.git

invoke std java for control panel via jre directory
---

diff --git a/jpctb b/jpctb
index 14b05d0..600bf14 100755
--- a/jpctb
+++ b/jpctb
@@ -152,12 +152,14 @@ linkfarm="$jtmp/linkfarm"
 extdir="$jtmp/ext"
 
 export JPCTB_JRE="$javadir/$jreleaf"
+realjava="$JPCTB_JRE/bin/java"
 
 #---------- confirm for the user which paths we're using ----------
 
 cat <<END
-   java:         "$javadir"
+   java dir.:    "$javadir"
    JRE:          "$JPCTB_JRE"
+   primary java: "$realjava"
    PCTB jars:    "$srcjardir"
    jpctb tmpdir: "$jtmp"
 END
@@ -167,7 +169,7 @@ END
 if $check_only; then echo "Check successful."; exit 0; fi
 
 set +e
-$setup_only_simulate "$javadir/bin/java" \
+$setup_only_simulate "$realjava" \
  -Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
  -jar "$srcjardir/PCTB-ControlPanel.jar"
 rc=$?