chiark
/
gitweb
/
~yarrgweb
/
jarrg-ian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable pctb uploads for now as they are broken
[jarrg-ian.git]
/
jpctb
diff --git
a/jpctb
b/jpctb
index 14b05d0d99c6e7cd034b3e4e383fcb32dd1d0f5a..50f295298b14b58b3cd688eafb23c4bef19aaaac 100755
(executable)
--- a/
jpctb
+++ b/
jpctb
@@
-152,13
+152,15
@@
linkfarm="$jtmp/linkfarm"
extdir="$jtmp/ext"
export JPCTB_JRE="$javadir/$jreleaf"
extdir="$jtmp/ext"
export JPCTB_JRE="$javadir/$jreleaf"
+realjava="$JPCTB_JRE/bin/java"
#---------- confirm for the user which paths we're using ----------
cat <<END
#---------- 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
jpctb tmpdir: "$jtmp"
END
@@
-167,7
+169,7
@@
END
if $check_only; then echo "Check successful."; exit 0; fi
set +e
if $check_only; then echo "Check successful."; exit 0; fi
set +e
-$setup_only_simulate "$
javadir/bin/
java" \
+$setup_only_simulate "$
real
java" \
-Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
-jar "$srcjardir/PCTB-ControlPanel.jar"
rc=$?
-Dcom.tedpearson.ypp.market.controlpanel.exitstatus=12 \
-jar "$srcjardir/PCTB-ControlPanel.jar"
rc=$?