Author: paulcager-guest
Date: 2007-08-12 22:21:56 +0000 (Sun, 12 Aug 2007)
New Revision: 4009
Modified:
trunk/maven2/debian/patches/mvn-cmd.patch
Log:
Set up JAVA_HOME correctly (not yet tested).
Modified: trunk/maven2/debian/patches/mvn-cmd.patch
===================================================================
--- trunk/maven2/debian/patches/mvn-cmd.patch 2007-08-12 15:22:07 UTC (rev
4008)
+++ trunk/maven2/debian/patches/mvn-cmd.patch 2007-08-12 22:21:56 UTC (rev
4009)
@@ -1,19 +1,30 @@
diff -Nur maven/maven-core/src/bin/mvn maven.new/maven-core/src/bin/mvn
---- maven/maven-core/src/bin/mvn 2007-07-18 11:52:45.000000000 +0100
-+++ maven.new/maven-core/src/bin/mvn 2007-07-18 11:54:56.000000000 +0100
-@@ -37,6 +37,10 @@
- # ----------------------------------------------------------------------------
+--- maven/maven-core/src/bin/mvn 2007-08-12 17:51:18.000000000 +0100
++++ maven.new/maven-core/src/bin/mvn 2007-08-12 21:17:51.000000000 +0100
+@@ -72,9 +72,21 @@
+ ;;
+ esac
-
+if [ -z "$M2_HOME" ] ; then
+ M2_HOME="/usr/share/maven2"
+fi
+
if [ -z "$JAVA_HOME" ] ; then
- JAVA_HOME="/usr"
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
++ else
++ # Debian patch - search for suitable iinstalled JRE, favouring a SUN
implementation.
++ for jre in /usr/lib/jvm/*-sun-* /usr/lib/jvm/* /usr/share/kaffe-common ;
do
++ if [ -x $jre/bin/java ] ; then
++ JAVA_HOME=$jre
++ break
++ fi
++ done
+ fi
fi
-@@ -164,7 +168,7 @@
+@@ -160,7 +172,7 @@
+
exec "$JAVACMD" \
$MAVEN_OPTS \
- -classpath "${M2_HOME}"/boot/classworlds-*.jar \
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
