You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/12/20 12:05:00 UTC
svn commit: r728265 - in /maven/components/branches/maven-2.1.x: ./
apache-maven/ apache-maven/src/bin/mvn.bat apache-maven/src/bin/mvnDebug.bat
Author: bentmann
Date: Sat Dec 20 03:05:00 2008
New Revision: 728265
URL: http://svn.apache.org/viewvc?rev=728265&view=rev
Log:
[MNG-3930] mvn.bat doesn't handle ampersand in Windows user name properly
o Merged from r728264
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/ (props changed)
maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvn.bat
maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat
Propchange: maven/components/branches/maven-2.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 20 03:05:00 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359,726876-726881
-/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885,727007,727548,727998
+/maven/components/branches/maven-2.0.x:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885,727007,727548,727998,728264
/maven/components/branches/maven-2.1.0-M1-RC:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC:688883,689695,689976,689990
/maven/components/trunk:720001,721902,726845
Propchange: maven/components/branches/maven-2.1.x/apache-maven/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 20 03:05:00 2008
@@ -1,5 +1,5 @@
/maven/components/branches/maven-2.0.10-RC/apache-maven:679193-679867,680477-688882,720697,725329-725330,725342,725349,725359,726876-726881
-/maven/components/branches/maven-2.0.x/apache-maven:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885,727007,727548
+/maven/components/branches/maven-2.0.x/apache-maven:679552-679867,709032,709208,709241,720042,725949,726244,726417,726541,726885,727007,727548,728264
/maven/components/branches/maven-2.1.0-M1-RC/apache-maven:690315,691793-694304
/maven/components/branches/maven-2.1.0-RC/apache-maven:688883,689695,689976,689990
/maven/components/trunk/apache-maven:720001,721902,726845,727688
Modified: maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvn.bat
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvn.bat?rev=728265&r1=728264&r2=728265&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvn.bat (original)
+++ maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvn.bat Sat Dec 20 03:05:00 2008
@@ -38,7 +38,7 @@
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
@@ -64,7 +64,7 @@
echo.
echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = %JAVA_HOME%
+echo JAVA_HOME = "%JAVA_HOME%"
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation
echo.
@@ -73,8 +73,8 @@
:chkMHome
if not "%M2_HOME%"=="" goto valMHome
-if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0..
-if "%OS%"=="WINNT" SET M2_HOME=%~dp0..
+if "%OS%"=="Windows_NT" SET "M2_HOME=%~dp0.."
+if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.."
if not "%M2_HOME%"=="" goto valMHome
echo.
@@ -87,8 +87,8 @@
:valMHome
:stripMHome
-if not _%M2_HOME:~-1%==_\ goto checkMBat
-set M2_HOME=%M2_HOME:~0,-1%
+if not "_%M2_HOME:~-1%"=="_\" goto checkMBat
+set "M2_HOME=%M2_HOME:~0,-1%"
goto stripMHome
:checkMBat
@@ -96,7 +96,7 @@
echo.
echo ERROR: M2_HOME is set to an invalid directory.
-echo M2_HOME = %M2_HOME%
+echo M2_HOME = "%M2_HOME%"
echo Please set the M2_HOME variable in your environment to match the
echo location of the Maven installation
echo.
Modified: maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat?rev=728265&r1=728264&r2=728265&view=diff
==============================================================================
--- maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat (original)
+++ maven/components/branches/maven-2.1.x/apache-maven/src/bin/mvnDebug.bat Sat Dec 20 03:05:00 2008
@@ -41,7 +41,7 @@
@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set HOME=%HOMEDRIVE%%HOMEPATH%)
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
@@ -67,7 +67,7 @@
echo.
echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = %JAVA_HOME%
+echo JAVA_HOME = "%JAVA_HOME%"
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation
echo.
@@ -76,8 +76,8 @@
:chkMHome
if not "%M2_HOME%"=="" goto valMHome
-if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0..
-if "%OS%"=="WINNT" SET M2_HOME=%~dp0..
+if "%OS%"=="Windows_NT" SET "M2_HOME=%~dp0.."
+if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.."
if not "%M2_HOME%"=="" goto valMHome
echo.
@@ -90,8 +90,8 @@
:valMHome
:stripMHome
-if not _%M2_HOME:~-1%==_\ goto checkMBat
-set M2_HOME=%M2_HOME:~0,-1%
+if not "_%M2_HOME:~-1%"=="_\" goto checkMBat
+set "M2_HOME=%M2_HOME:~0,-1%"
goto stripMHome
:checkMBat
@@ -99,7 +99,7 @@
echo.
echo ERROR: M2_HOME is set to an invalid directory.
-echo M2_HOME = %M2_HOME%
+echo M2_HOME = "%M2_HOME%"
echo Please set the M2_HOME variable in your environment to match the
echo location of the Maven installation
echo.