[patch] henplus-0.9.7.patch

henplus-0.9.7.patch (text/plain), 1.69 KB, created by Ole Langbehn on 2006-09-06 08:58:28 UTC

--- bin/henplus	2006-03-20 00:11:26.000000000 +0100
+++ /usr/bin/henplus	2006-09-06 17:38:13.038323750 +0200
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: henplus,v 1.13 2006/03/19 22:41:56 hzeller Exp $
+# $Id: henplus,v 1.12 2004/01/29 22:31:52 hzeller Exp $
 ##
 
 # additional flags you might want to pass to the java interpreter
@@ -7,31 +7,14 @@
 JAVA_FLAGS=
 
 if [ -z "$JAVA_HOME" ] ; then
-    # try to use java in path
-    JAVA=java
+    # use java-config to determine java vm
+    JAVA=$(java-config -J)
 else
     JAVA=$JAVA_HOME/bin/java
 fi
 
-##------------------
-THISDIR=`dirname $0`
-# install layout is: script in /usr/bin/henplus and libs in /usr/share/henplus
-HENPLUSDIR=$THISDIR/../share/henplus
-
-# not yet installed ? Then look in the local build directory
-if [ ! -d "$HENPLUSDIR" ] ; then
-	HENPLUSDIR=$THISDIR/..
-	for f in $HENPLUSDIR/lib/*.jar ; do
-	    CLASSPATH=$CLASSPATH:$f
-	done
-	CLASSPATH=$HENPLUSDIR/build/classes:$CLASSPATH
-fi
-
-# location of the readline lib.
-# Modify this, if you installation stores this at a different
-# position.
-LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
-CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
+HENPLUSDIR=$(dirname $(java-config -p henplus))
+CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java):$(java-config -p commons-cli-1)
 
 # you may just throw your own jar files in this dir.
 # (like additional JDBC-drivers, that are not in default
@@ -70,7 +53,4 @@
         CLASSPATH=$CLASSPATH:$f
     fi
 done
-
-export CLASSPATH LD_LIBRARY_PATH
-
-exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
+LD_LIBRARY_PATH="$(java-config -i libreadline-java):$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"