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

more work on that quoting. seems to finally have come good, at least in bash... 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@169467 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-05-10 13:34:16 +00:00
parent 3718136fe5
commit 53d6c53cb6
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
m2-bootstrap-all.sh
View File

@ -6,7 +6,6 @@
JAVACMD=$JAVA_HOME/bin/java
ARGS="$@"
ORIG_ARGS="$ARGS"
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
@ -16,15 +15,11 @@ esac
# For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then
[ -n "$M2_HOME" ] && M2_HOME=`cygpath -psw "$M2_HOME"`
[ -n "$M2_HOME" ] && M2_HOME=`cygpath -pw "$M2_HOME"`
fi
if [ ! -z "$M2_HOME" ]; then
if [ -n "$ARGS" ]; then
ARGS="$ARGS -Dmaven.home=$M2_HOME"
else
ARGS="-Dmaven.home=$M2_HOME"
fi
HOME_ARGS="-Dmaven.home=$M2_HOME"
fi
# Build and install mboot
@ -34,7 +29,7 @@ fi
echo "-----------------------------------------------------------------------"
cd ./maven-mboot2
./build $ARGS
./build $ARGS "$HOME_ARGS"
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
@ -44,7 +39,7 @@ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
echo " Building maven2 components ... "
echo "-----------------------------------------------------------------------"
"$JAVACMD" $ARGS $MAVEN_OPTS -jar mboot.jar
"$JAVACMD" $ARGS "$HOME_ARGS" $MAVEN_OPTS -jar mboot.jar
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
@ -65,7 +60,7 @@ ret=$?; if [ $ret != 0 ]; then exit $ret; fi
echo
echo "Running maven-core integration tests ..."
echo
./maven-core-it.sh $ORIG_ARGS
./maven-core-it.sh "$HOME_ARGS" $ARGS
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
)
ret=$?; if [ $ret != 0 ]; then exit $ret; fi

8
maven-core-it/maven-core-it.sh
View File

@ -6,12 +6,6 @@ cp=../maven-core-it-verifier/target/maven-core-it-verifier-1.0.jar
verifier=org.apache.maven.it.Verifier
jvm_args="$@"
if [ ! -z "$MAVEN_OPTS" ]; then
jvm_args="$MAVEN_OPTS $jvm_args"
fi
# OS specific support. $var _must_ be set to either true or false.
cygwin=false;
case "`uname`" in
@ -29,5 +23,5 @@ if [ ! -z "$M2_HOME" ]; then
jvm_m2_home="-Dmaven.home=$M2_HOME"
fi
java "$jvm_m2_home" $jvm_args -cp "$cp" $verifier
java "$jvm_m2_home" $MAVEN_OPTS "$@" -cp "$cp" $verifier