svn commit: r169467 - /maven/components/trunk/m2-bootstrap-all.sh /maven/components/trunk/maven-core-it/maven-core-it.sh

[br...@apache.org]

Author: brett
Date: Tue May 10 06:34:16 2005
New Revision: 169467

URL: http://svn.apache.org/viewcvs?rev=169467&view=rev
Log:
more work on that quoting. seems to finally have come good, at least in bash...

Modified:
    maven/components/trunk/m2-bootstrap-all.sh
    maven/components/trunk/maven-core-it/maven-core-it.sh

Modified: maven/components/trunk/m2-bootstrap-all.sh
URL: http://svn.apache.org/viewcvs/maven/components/trunk/m2-bootstrap-all.sh?rev=169467&r1=169466&r2=169467&view=diff
==============================================================================
--- maven/components/trunk/m2-bootstrap-all.sh (original)
+++ maven/components/trunk/m2-bootstrap-all.sh Tue May 10 06:34:16 2005
@@ -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 @@
 
 # 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 @@
   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 @@
   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 @@
   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

Modified: maven/components/trunk/maven-core-it/maven-core-it.sh
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/maven-core-it.sh?rev=169467&r1=169466&r2=169467&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/maven-core-it.sh (original)
+++ maven/components/trunk/maven-core-it/maven-core-it.sh Tue May 10 06:34:16 2005
@@ -6,12 +6,6 @@
 
 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 @@
   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
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org