From continuum-commits-return-1403-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Thu Dec 22 13:49:09 2005 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 16055 invoked from network); 22 Dec 2005 13:49:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Dec 2005 13:49:09 -0000 Received: (qmail 39651 invoked by uid 500); 22 Dec 2005 13:49:08 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 39622 invoked by uid 500); 22 Dec 2005 13:49:08 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 39608 invoked by uid 99); 22 Dec 2005 13:49:08 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 22 Dec 2005 05:49:08 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 22 Dec 2005 05:49:07 -0800 Received: (qmail 15889 invoked by uid 65534); 22 Dec 2005 13:48:47 -0000 Message-ID: <20051222134847.15888.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358566 - /maven/continuum/trunk/continuum-site/src/site/resources/scripts/mvn.bat Date: Thu, 22 Dec 2005 13:48:47 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Thu Dec 22 05:48:44 2005 New Revision: 358566 URL: http://svn.apache.org/viewcvs?rev=358566&view=rev Log: Fix exit code Modified: maven/continuum/trunk/continuum-site/src/site/resources/scripts/mvn.bat Modified: maven/continuum/trunk/continuum-site/src/site/resources/scripts/mvn.bat URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-site/src/site/resources/scripts/mvn.bat?rev=358566&r1=358565&r2=358566&view=diff ============================================================================== --- maven/continuum/trunk/continuum-site/src/site/resources/scripts/mvn.bat (original) +++ maven/continuum/trunk/continuum-site/src/site/resources/scripts/mvn.bat Thu Dec 22 05:48:44 2005 @@ -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,6 +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 goto end :error