From d4af503a5caabb1f77b8201c635fae8804142200 Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Wed, 4 May 2005 23:43:47 +0000
Subject: [PATCH] align error handling with that of m1

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@168214 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-core/src/bin/m2.bat | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/maven-core/src/bin/m2.bat b/maven-core/src/bin/m2.bat
index 31f5bcc857..c8cbfbf1b5 100644
--- a/maven-core/src/bin/m2.bat
+++ b/maven-core/src/bin/m2.bat
@@ -41,6 +41,8 @@ if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
 @REM set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" @setlocal
 
+set ERROR_CODE=0
+
 @REM ==== START VALIDATION ====
 if not "%JAVA_HOME%" == "" goto OkJHome
 
@@ -49,6 +51,7 @@ echo ERROR: JAVA_HOME not found in your environment.
 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
 
 :OkJHome
@@ -60,6 +63,7 @@ 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.
+set ERROR_CODE=1
 goto end
 
 :chkMHome
@@ -73,6 +77,7 @@ echo ERROR: M2_HOME not found in your environment.
 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
 
 :valMHome
@@ -84,6 +89,7 @@ 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.
+set ERROR_CODE=1
 goto end
 @REM ==== END VALIDATION ====
 
@@ -122,7 +128,11 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 
 @REM Start MAVEN2
 %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
+goto end
+
+:error
+if "%OS%"=="Windows_NT" @endlocal
+set ERROR_CODE=1
 
 :end
 @REM set local scope for the variables with windows NT shell
@@ -142,3 +152,5 @@ if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
 @REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on'
 if "%MAVEN_BATCH_PAUSE%" == "on" pause
 
+exit /B %ERROR_CODE%
+