chiark
/
gitweb
/
~yarrgweb
/
jarrg-owen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jpctb: More fixes for testing
[jarrg-owen.git]
/
jpctb
diff --git
a/jpctb
b/jpctb
index fbc732adef64a539151dd88b22de17f9094fb7ad..c7bfe4b3a8c8facf18cf07d18eb87afe0208963c 100755
(executable)
--- a/
jpctb
+++ b/
jpctb
@@
-80,11
+80,11
@@
jpctb:
END
if [ -x "$yppdir/java/bin/java" ]; then
END
if [ -x "$yppdir/java/bin/java" ]; then
- if [
test
-d "$yppdir/java/jre" ]; then
+ if [ -d "$yppdir/java/jre" ]; then
echo " yohoho/java/bin and yohoho/java/jre exist, good"
javadir="$yppdir/java"
else
echo " yohoho/java/bin and yohoho/java/jre exist, good"
javadir="$yppdir/java"
else
- absjava=`readlink -f "$
javadir
/bin/java"`
+ absjava=`readlink -f "$
yppdir/java
/bin/java"`
cat <<END
yohoho/java/bin exists but yohoho/java/jre does not
abs. java: "$absjava"
cat <<END
yohoho/java/bin exists but yohoho/java/jre does not
abs. java: "$absjava"
@@
-117,7
+117,7
@@
fi
openjdk=/usr/lib/jvm/java-6-openjdk
if [ "x$javadir" = x ] && [ -x $openjdk/bin/java ]; then
openjdk=/usr/lib/jvm/java-6-openjdk
if [ "x$javadir" = x ] && [ -x $openjdk/bin/java ]; then
- echo " using openjdk, hopefully it will work with YPP!"
+ echo "
using openjdk, hopefully it will work with YPP!"
javadir=$openjdk
fi
javadir=$openjdk
fi