Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 16947 invoked from network); 18 Dec 2005 23:43:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Dec 2005 23:43:14 -0000 Received: (qmail 8975 invoked by uid 500); 18 Dec 2005 23:43:13 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 8956 invoked by uid 500); 18 Dec 2005 23:43:13 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 8945 invoked by uid 99); 18 Dec 2005 23:43:12 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Dec 2005 15:43:12 -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; Sun, 18 Dec 2005 15:43:12 -0800 Received: (qmail 16498 invoked by uid 65534); 18 Dec 2005 23:42:51 -0000 Message-ID: <20051218234251.16497.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r357562 - /geronimo/trunk/modules/scripts/src/resources/bin/startup.bat Date: Sun, 18 Dec 2005 23:42:51 -0000 To: scm@geronimo.apache.org From: jsisson@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: jsisson Date: Sun Dec 18 15:42:40 2005 New Revision: 357562 URL: http://svn.apache.org/viewcvs?rev=357562&view=rev Log: GERONIMO-1385 - fix issue where startup.bat was echoing batch commands Modified: geronimo/trunk/modules/scripts/src/resources/bin/startup.bat Modified: geronimo/trunk/modules/scripts/src/resources/bin/startup.bat URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/scripts/src/resources/bin/startup.bat?rev=357562&r1=357561&r2=357562&view=diff ============================================================================== --- geronimo/trunk/modules/scripts/src/resources/bin/startup.bat (original) +++ geronimo/trunk/modules/scripts/src/resources/bin/startup.bat Sun Dec 18 15:42:40 2005 @@ -33,7 +33,16 @@ @REM $Rev$ $Date$ @REM -------------------------------------------------------------------- -if "%OS%" == "Windows_NT" setlocal +@if "%GERONIMO_BATCH_ECHO%" == "on" echo on +@if not "%GERONIMO_BATCH_ECHO%" == "on" echo off + +if "%OS%" == "Windows_NT" goto okOsCheck +echo Cannot process Geronimo command - you are running an unsupported operating system. +set ERRORLEVEL=1 +goto end + +:okOsCheck +setlocal @REM Guess GERONIMO_HOME if not defined set CURRENT_DIR=%cd%