Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

always call $JAVA_HOME/bin/java 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@348004 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-11-21 22:42:41 +00:00
parent 7bef1723ce
commit 271c4a2f36
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bootstrap.sh
View File

@ -3,11 +3,18 @@
ARGS=$@
ORIG_ARGS=$ARGS
if [ -z "$JAVA_HOME" ]; then
echo You must specify the JAVA_HOME environment variable
exit 1
fi
JAVACMD="$JAVA_HOME/bin/java"
(
cd bootstrap/bootstrap-mini
./build
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
java $MAVEN_OPTS -jar bootstrap-mini.jar install $ARGS
$JAVACMD $MAVEN_OPTS -jar bootstrap-mini.jar install $ARGS
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
@ -16,7 +23,7 @@ BOOTSTRAP_JAR=bootstrap-mini/bootstrap-mini.jar
(
cd bootstrap/bootstrap-installer
java $MAVEN_OPTS -jar ../$BOOTSTRAP_JAR package $ARGS
$JAVACMD $MAVEN_OPTS -jar ../$BOOTSTRAP_JAR package $ARGS
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
@ -42,7 +49,7 @@ fi
OLD_M2_HOME=$M2_HOME
unset M2_HOME
java $MAVEN_OPTS -jar bootstrap/bootstrap-installer/target/bootstrap-installer.jar --prefix=$PREFIX $ARGS
$JAVACMD $MAVEN_OPTS -jar bootstrap/bootstrap-installer/target/bootstrap-installer.jar --prefix=$PREFIX $ARGS
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
M2_HOME=$OLD_M2_HOME
export M2_HOME
@ -52,7 +59,7 @@ ARGS=$ORIG_ARGS
(
# TODO: should w ebe going back to the mini now that we have the real thing?
cd maven-core-it-verifier
java $MAVEN_OPTS -jar ../bootstrap/$BOOTSTRAP_JAR package $ARGS
$JAVACMD $MAVEN_OPTS -jar ../bootstrap/$BOOTSTRAP_JAR package $ARGS
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi