From 29d70b8f7d6cc75cd01f0ea51a6128a52312c065 Mon Sep 17 00:00:00 2001 From: Brett Leslie Porter Date: Tue, 5 Apr 2005 06:48:51 +0000 Subject: [PATCH] work with spaces in path on Windows NT git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@163778 13f79535-47bb-0310-9956-ffa450edef68 --- maven-core/src/bin/m2.bat | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/maven-core/src/bin/m2.bat b/maven-core/src/bin/m2.bat index 9175ea4797..31f5bcc857 100644 --- a/maven-core/src/bin/m2.bat +++ b/maven-core/src/bin/m2.bat @@ -35,11 +35,6 @@ @REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' @if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% -@REM Setting default values -set CLASSWORLDS_JAR=%M2_HOME%\core\boot\classworlds-*.jar -set CLASSWORLDS_CONF=%M2_HOME%\bin\m2.conf -set CLASSWORLDS_LAUNCHER=org.codehaus.classworlds.Launcher - @REM Execute a user defined script before this one if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" @@ -70,7 +65,7 @@ goto end :chkMHome if not "%M2_HOME%"=="" goto valMHome -if "%OS%"=="Windows_NT" SET M2_HOME=%~dp0\.. +if "%OS%"=="Windows_NT" SET M2_HOME=%~dps0\.. if not "%M2_HOME%"=="" goto valMHome echo. @@ -126,7 +121,7 @@ if "%MAVEN_OPTS%"=="" SET MAVEN_OPTS="-Xmx256m" SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" @REM Start MAVEN2 -%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%CLASSWORLDS_CONF%" "-Dmaven.home=%M2_HOME%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %M2_HOME%\core\boot\classworlds-*.jar "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS% goto :end :end