brett 2004/03/22 18:55:40
Modified: src/bin Tag: MAVEN-1_0-BRANCH maven
Log:
PR: MAVEN-1179
allow spaces in JAVA_HOME
Revision Changes Path
No revision
No revision
1.31.4.3 +5 -5 maven/src/bin/maven
Index: maven
===================================================================
RCS file: /home/cvs/maven/src/bin/maven,v
retrieving revision 1.31.4.2
retrieving revision 1.31.4.3
diff -u -r1.31.4.2 -r1.31.4.3
--- maven 4 Mar 2004 17:47:31 -0000 1.31.4.2
+++ maven 23 Mar 2004 02:55:40 -0000 1.31.4.3
@@ -97,9 +97,9 @@
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD=$JAVA_HOME/jre/sh/java
+ JAVACMD="$JAVA_HOME/jre/sh/java"
else
- JAVACMD=$JAVA_HOME/bin/java
+ JAVACMD="$JAVA_HOME/bin/java"
fi
else
JAVACMD=java
@@ -119,7 +119,7 @@
echo " to the installation directory of java."
fi
-MAVEN_ENDORSED==${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed
+MAVEN_ENDORSED="${JAVA_HOME}/lib/endorsed:${MAVEN_HOME}/lib/endorsed"
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
@@ -141,7 +141,7 @@
MAIN_CLASS=com.werken.forehead.Forehead
if [ -n "$MAVEN_HOME_LOCAL" ]; then
- $JAVACMD \
+ "$JAVACMD" \
$MAVEN_OPTS \
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
\
@@ -154,7 +154,7 @@
$MAIN_CLASS $@
fi
if [ ! -n "$MAVEN_HOME_LOCAL" ]; then
- $JAVACMD \
+ "$JAVACMD" \
$MAVEN_OPTS \
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl
\
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
