chiark
/
gitweb
/
~yarrgweb
/
jarrg-ian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e264590
)
invoke std java for control panel via jre directory
0.9.4
author
Ian Jackson
<ian@liberator.relativity.greenend.org.uk>
Wed, 25 Aug 2010 21:58:52 +0000
(22:58 +0100)
committer
Ian Jackson
<ian@liberator.relativity.greenend.org.uk>
Wed, 25 Aug 2010 21:58:52 +0000
(22:58 +0100)
jpctb
patch
|
blob
|
history
diff --git
a/jpctb
b/jpctb
index 14b05d0d99c6e7cd034b3e4e383fcb32dd1d0f5a..600bf1451240dc646b90e9e70d48bece5253c52e 100755
(executable)
--- a/
jpctb
+++ b/
jpctb
@@
-152,12
+152,14
@@
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"
+ java
dir.:
"$javadir"
JRE: "$JPCTB_JRE"
JRE: "$JPCTB_JRE"
+ primary java: "$realjava"
PCTB jars: "$srcjardir"
jpctb tmpdir: "$jtmp"
END
PCTB jars: "$srcjardir"
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=$?