[packages/maven.git] / maven-MAVEN_HOME.patch

diff -u -r maven-1.0-beta-10.org/bin/maven maven-1.0-beta-10/bin/maven
--- maven-1.0-beta-10.org/bin/maven	Fri Aug 29 17:40:42 2003
+++ maven-1.0-beta-10/bin/maven	Fri Aug 29 17:44:17 2003
@@ -21,7 +21,9 @@
 
 if [ -z "$MAVEN_HOME" ] ; then
   # try to find MAVEN
-  if [ -d /opt/maven ] ; then
+  if [ -d /usr/share/maven ] ; then 
+    MAVEN_HOME=/usr/share/maven
+  elif [ -d /opt/maven ] ; then
     MAVEN_HOME=/opt/maven
   fi
 
@@ -67,6 +69,10 @@
     CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
 fi
 
+if [ -z "$JAVA_HOME" -a -x /usr/lib/java/bin/java ]; then
+  JAVA_HOME=/usr/lib/java
+fi
+
 if [ -z "$JAVACMD" ] ; then
   if [ -n "$JAVA_HOME"  ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Commit	Line	Data
4077fe39	1	diff -u -r maven-1.0-beta-10.org/bin/maven maven-1.0-beta-10/bin/maven
	2	--- maven-1.0-beta-10.org/bin/maven Fri Aug 29 17:40:42 2003
	3	+++ maven-1.0-beta-10/bin/maven Fri Aug 29 17:44:17 2003
	4	@@ -21,7 +21,9 @@
	5
	6	if [ -z "$MAVEN_HOME" ] ; then
	7	# try to find MAVEN
	8	- if [ -d /opt/maven ] ; then
	9	+ if [ -d /usr/share/maven ] ; then
	10	+ MAVEN_HOME=/usr/share/maven
	11	+ elif [ -d /opt/maven ] ; then
	12	MAVEN_HOME=/opt/maven
	13	fi
	14
	15	@@ -67,6 +69,10 @@
	16	CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
	17	fi
	18
	19	+if [ -z "$JAVA_HOME" -a -x /usr/lib/java/bin/java ]; then
	20	+ JAVA_HOME=/usr/lib/java
	21	+fi
	22	+
	23	if [ -z "$JAVACMD" ] ; then
	24	if [ -n "$JAVA_HOME" ] ; then
	25	if [ -x "$JAVA_HOME/jre/sh/java" ] ; then