[maven] branch MNG-5937 updated: try proper value for MAVENHOME_CONFIG

[rf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-5937
in repository https://gitbox.apache.org/repos/asf/maven.git


The following commit(s) were added to refs/heads/MNG-5937 by this push:
     new e310cd4  try proper value for MAVENHOME_CONFIG
e310cd4 is described below

commit e310cd4a90a504f4c454f3851a36c6df1b5f23ff
Author: rfscholte <rf...@apache.org>
AuthorDate: Fri May 22 13:21:36 2020 +0200

    try proper value for MAVENHOME_CONFIG
---
 apache-maven/src/assembly/shared/init        | 2 +-
 apache-maven/src/assembly/shared/mvnlauncher | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apache-maven/src/assembly/shared/init b/apache-maven/src/assembly/shared/init
index da4f7d3..ff8e770 100755
--- a/apache-maven/src/assembly/shared/init
+++ b/apache-maven/src/assembly/shared/init
@@ -91,7 +91,7 @@ cd "$saveddir"
 # For Cygwin, ensure paths are in Unix format before anything is touched
 if $cygwin ; then
   [ -n "$MAVEN_HOME" ] &&
-    MAVEN_HOME=`cygpath --unix "$M2_HOME"`
+    MAVEN_HOME=`cygpath --unix "$MAVEN_HOME"`
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
   [ -n "$CLASSPATH" ] &&
diff --git a/apache-maven/src/assembly/shared/mvnlauncher b/apache-maven/src/assembly/shared/mvnlauncher
index c9fd1de..5dd07da 100644
--- a/apache-maven/src/assembly/shared/mvnlauncher
+++ b/apache-maven/src/assembly/shared/mvnlauncher
@@ -1,4 +1,4 @@
 LAUNCHER_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar`
 MAVEN_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
-MAVENHOME_CONFIG="-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" "-Dmaven.home=${MAVEN_HOME}" "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native"
+MAVENHOME_CONFIG='"-Dclassworlds.conf=${MAVEN_HOME}/bin/m2.conf" "-Dmaven.home=${MAVEN_HOME}" "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native"'