cvs commit: maven-components/maven-core/src/bin m2

[brett]

brett       2005/04/04 09:16:34

  Modified:    maven-core/src/bin m2
  Log:
  handle spaces in $M2_HOME
  
  Revision  Changes    Path
  1.9       +3 -5      maven-components/maven-core/src/bin/m2
  
  Index: m2
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/bin/m2,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- m2        4 Apr 2005 15:37:26 -0000       1.8
  +++ m2        4 Apr 2005 16:16:34 -0000       1.9
  @@ -54,7 +54,7 @@
     fi
   
     ## resolve links - $0 may be a link to maven's home
  -  PRG=$0
  +  PRG="$0"
     saveddir=`pwd`
   
     # need this for relative symlinks
  @@ -124,14 +124,12 @@
       JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
     [ -n "$HOME" ] &&
       HOME=`cygpath --path --windows "$HOME"`
  -  [ -n "$CLASSWORLDS_JAR" ] && CLASSWORLDS_JAR=`cygpath --path --windows 
"$CLASSWORLDS_JAR"`
  -  [ -n "$CLASSWORLDS_CONF" ] && CLASSWORLDS_CONF=`cygpath --path --windows 
"$CLASSWORLDS_CONF"`
   fi
   
   $JAVACMD \
     $MAVEN_OPTS \
  -  -classpath ${CLASSWORLDS_JAR} \
  -  "-Dclassworlds.conf=${CLASSWORLDS_CONF}"  \
  +  -classpath "${M2_HOME}"/core/boot/classworlds-*.jar \
  +  "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
     "-Dmaven.home=${M2_HOME}"  \
     ${CLASSWORLDS_LAUNCHER} $@