Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 522F718E87 for ; Wed, 9 Dec 2015 06:27:44 +0000 (UTC) Received: (qmail 64721 invoked by uid 500); 9 Dec 2015 06:27:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 64673 invoked by uid 500); 9 Dec 2015 06:27:44 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 64664 invoked by uid 99); 9 Dec 2015 06:27:44 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Dec 2015 06:27:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 13E02E0AF4; Wed, 9 Dec 2015 06:27:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-2030 Fixed issue with JAVA_HOME containing parenthesis Date: Wed, 9 Dec 2015 06:27:44 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1.5 bdbe4068b -> 69047243b ignite-2030 Fixed issue with JAVA_HOME containing parenthesis Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69047243 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69047243 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69047243 Branch: refs/heads/ignite-1.5 Commit: 69047243bb1de980647711a59573bf44e69761eb Parents: bdbe406 Author: sboikov Authored: Wed Dec 9 09:27:23 2015 +0300 Committer: sboikov Committed: Wed Dec 9 09:27:23 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 5 +++-- bin/include/parseargs.bat | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/ignite.bat ---------------------------------------------------------------------- diff --git a/bin/ignite.bat b/bin/ignite.bat index 43cc58b..97c2e45 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -20,6 +20,7 @@ :: @echo off +Setlocal EnableDelayedExpansion if "%OS%" == "Windows_NT" setlocal @@ -119,7 +120,7 @@ if %ERRORLEVEL% neq 0 ( :: Process 'restart'. :: set RANDOM_NUMBER_COMMAND="%JAVA_HOME%\bin\java.exe" -cp %CP% org.apache.ignite.startup.cmdline.CommandLineRandomNumberGenerator -for /f "usebackq tokens=*" %%i in (`"%RANDOM_NUMBER_COMMAND%"`) do set RANDOM_NUMBER=%%i +for /f "usebackq tokens=*" %%i in (`%RANDOM_NUMBER_COMMAND%`) do set RANDOM_NUMBER=%%i set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%" set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE% @@ -132,7 +133,7 @@ set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE% :: This is executed if -nojmx is not specified :: if not "%NO_JMX%" == "1" ( - for /F "tokens=*" %%A in ('""%JAVA_HOME%\bin\java" -cp %CP% org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do ( + for /F "tokens=*" %%A in ('""!JAVA_HOME!\bin\java" -cp %CP% org.apache.ignite.internal.util.portscanner.GridJmxPortFinder"') do ( set JMX_PORT=%%A ) ) http://git-wip-us.apache.org/repos/asf/ignite/blob/69047243/bin/include/parseargs.bat ---------------------------------------------------------------------- diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat index c4b35d2..86e5766 100644 --- a/bin/include/parseargs.bat +++ b/bin/include/parseargs.bat @@ -40,7 +40,7 @@ :: in other scripts to parse common command lines parameters. set convertArgsCmd="%JAVA_HOME%\bin\java.exe" -cp %CP% org.apache.ignite.startup.cmdline.CommandLineTransformer %* -for /f "usebackq tokens=*" %%i in (`"%convertArgsCmd%"`) do set reformattedArgs=%%i +for /f "usebackq tokens=*" %%i in (`%convertArgsCmd%`) do set reformattedArgs=%%i for %%i in (%reformattedArgs%) do ( if "%%i" == "CommandLineTransformerError" exit /b 1