Author: evenisse
Date: Mon Jan 23 08:16:28 2006
New Revision: 371568
URL: http://svn.apache.org/viewcvs?rev=371568&view=rev
Log:
Merge from trunk that contains correct code
Modified:
maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat
Modified: maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat
URL:
http://svn.apache.org/viewcvs/maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat?rev=371568&r1=371567&r2=371568&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat (original)
+++ maven/components/branches/maven-2.0.x/maven-core/src/bin/mvn.bat Mon Jan 23
08:16:28 2006
@@ -51,8 +51,7 @@
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation
echo.
-set ERROR_CODE=1
-goto end
+goto error
:OkJHome
if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome
@@ -63,8 +62,7 @@
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation
echo.
-set ERROR_CODE=1
-goto end
+goto error
:chkMHome
if not "%M2_HOME%"=="" goto valMHome
@@ -77,8 +75,7 @@
echo Please set the M2_HOME variable in your environment to match the
echo location of the Maven installation
echo.
-set ERROR_CODE=1
-goto end
+goto error
:valMHome
if exist "%M2_HOME%\bin\m2.bat" goto init
@@ -89,8 +86,7 @@
echo Please set the M2_HOME variable in your environment to match the
echo location of the Maven installation
echo.
-set ERROR_CODE=1
-goto end
+goto error
@REM ==== END VALIDATION ====
:init
@@ -128,7 +124,7 @@
@REM Start MAVEN2
for %%i in ("%M2_HOME%"\core\boot\classworlds-*) do set CLASSWORLDS_JAR="%%i"
%MAVEN_JAVA_EXE% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR%
"-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%"
org.codehaus.classworlds.Launcher %MAVEN_CMD_LINE_ARGS%
-if ErrorLevel 1 goto error
+if ERRORLEVEL 1 goto error
goto end
:error
