SOURCES: java-beanshell.sh - use jpackage-utils funcs

[glen]

Author: glen                         Date: Mon Feb  9 15:14:21 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use jpackage-utils funcs

---- Files affected:
SOURCES:
   java-beanshell.sh (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/java-beanshell.sh
diff -u SOURCES/java-beanshell.sh:1.1 SOURCES/java-beanshell.sh:1.2
--- SOURCES/java-beanshell.sh:1.1	Thu Feb  5 23:28:17 2009
+++ SOURCES/java-beanshell.sh	Mon Feb  9 16:14:15 2009
@@ -1,18 +1,12 @@
 #!/bin/sh
 
-if [ "$JAVA_HOME" ]; then
-  JAVA=$JAVA_HOME/bin/java
-else
-  if [ -x /usr/bin/gij ]; then
-    JAVA=/usr/bin/gij
-  else
-    if [ -x /usr/bin/java ]; then
-      JAVA=/usr/bin/java
-    else
-      echo "Java not found." >&2
-      exit 1
-    fi
-  fi
+# set JAVA_HOME from jpackage-utils if available
+if [ ! -f /usr/share/java-utils/java-functions ]; then
+	echo >&2 "Java not found."
+	exit 1
 fi
 
-$JAVA -jar $(find-jar bsh)
+. /usr/share/java-utils/java-functions
+set_javacmd
+
+exec $JAVACMD -jar $(find-jar bsh)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/java-beanshell.sh?r1=1.1&r2=1.2&f=u