new build script

[jarrg-ian.git] / jpctb

diff --git a/jpctb b/jpctb
index 5157a054c211afa043f6cad945361f28c1f15101..7cca6dfb09bb0fad97693a3bc542ae8696544c5a 100755 (executable)
--- a/jpctb
+++ b/jpctb
@@ -37,6 +37,7 @@ nojre () {
        fail "couldn't find the right jre: $*
  perhaps you should make ypp's java symlink (normally yohoho/java)
  point to your jre, eg to /usr/lib/jvm/java-6-sun"
+}
 
 badusage () {
        fail "bad usage: $*"
@@ -80,8 +81,8 @@ fi
 yppdir="${yohoho%/*}"
 
 # this replicates the java-searching logic from yohoho/yohoho:
-if [ -x "$yohoho/java/bin/java" ]; then
-       yppjava="$yohoho/java/bin/java"
+if [ -x "$yppdir/java/bin/java" ]; then
+       yppjava="$yppdir/java/bin/java"
 elif [ -x "$JAVA_HOME/bin/java" ]; then
        yppjava="$JAVA_HOME/bin/java"
 else
@@ -94,6 +95,7 @@ cat <<END
 jpctb:
    jpctb tree:  "$jpctbdir"
    yohoho:       "$yohoho"
+   ypp dir:      "$yppdir"
    ypp uses:     "$yppjava"
 END
 
@@ -101,7 +103,7 @@ if ! [ -x "$yppjava" ]; then
        nojre "bad java ypp"
 fi
 
-javadir="${yppjava#/bin/java}"
+javadir="${yppjava%/bin/java}"
 if [ -x "$javadir/jre/bin/java" ]; then
        echo "   java/ points to the jre, good"
 else
@@ -117,11 +119,10 @@ else
                nojre "java binary not in jre dir"
                ;;
        esac
-       fi
 fi
 
 case "$javadir" in
-|/|/usr)       nojre "javadir is $javadir (and even found $javadir/jre!)" ;;
+''|/|/usr)     nojre "javadir is $javadir (and even found $javadir/jre!)" ;;
 /*)            ;;
 *)             javadir="$PWD/$javadir" ;;
 esac