make arbitrage calculation optional

[jarrg-ian.git] / jpctb

diff --git a/jpctb b/jpctb
index 3557cd234bcf175845016e7ded7feab13dcb57c0..50f295298b14b58b3cd688eafb23c4bef19aaaac 100755 (executable)
--- a/jpctb
+++ b/jpctb
@@ -119,6 +119,7 @@ fi
 javadir="${yppjava%/bin/java}"
 if [ -x "$javadir/jre/bin/java" ]; then
        echo "   java/ points to the jre, good"
+       jreleaf=jre
 else
        echo "   java/ has just the executable bin/java, trying readlink"
        absjava=`readlink -f "$yppjava"`
@@ -151,13 +152,15 @@ 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"
-   JRE:          "$JPCTB_JRE"
-   PCTB jars:    "$srcjardir"
+   java dir.:    "$javadir"
+   jre:          "$JPCTB_JRE"
+   primary java: "$realjava"
+   jpctb jars:   "$srcjardir"
    jpctb tmpdir: "$jtmp"
 END
 
@@ -166,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=$?