maven git commit: [MNG-5538] mvn start script causes cygwin warning

[sc...@apache.org]

Repository: maven
Updated Branches:
  refs/heads/master dc7b41455 -> 5ca3ca550


[MNG-5538] mvn start script causes cygwin warning

This closes #27.


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/5ca3ca55
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/5ca3ca55
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/5ca3ca55

Branch: refs/heads/master
Commit: 5ca3ca55086d125366b58a3d58c1df77604dedbf
Parents: dc7b414
Author: Arlo Louis O'Keeffe <ma...@gmail.com>
Authored: Wed Oct 29 09:07:45 2014 +0100
Committer: Christian Schulte <sc...@apache.org>
Committed: Sat Dec 19 00:42:02 2015 +0100

----------------------------------------------------------------------
 apache-maven/src/bin/mvn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/5ca3ca55/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 293c97a..b5a9b68 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -183,6 +183,7 @@ if [ -z "$JAVA_HOME" ] ; then
 fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+CLASSWORDS_JAR=`echo "${M2_HOME}"/boot/plexus-classworlds-*.jar`
 
 # For Cygwin, switch paths to Windows format before running java
 if $cygwin; then
@@ -192,6 +193,8 @@ if $cygwin; then
     JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
     CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$CLASSWORLDS_JAR" ] &&
+    CLASSWORLDS_JAR=`cygpath --path --windows "$CLASSWORLDS_JAR"`
 fi
 
 # traverses directory structure from process work directory to filesystem root
@@ -238,7 +241,7 @@ export MAVEN_CMD_LINE_ARGS
 exec "$JAVACMD" \
   $MAVEN_OPTS \
   $MAVEN_DEBUG_OPTS \
-  -classpath "${M2_HOME}"/boot/plexus-classworlds-*.jar \
+  -classpath "${CLASSWORLDS_JAR}" \
   "-Dclassworlds.conf=${M2_HOME}/bin/m2.conf" \
   "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
   ${CLASSWORLDS_LAUNCHER} "$@"