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 91FAC180B6 for ; Fri, 11 Dec 2015 06:07:48 +0000 (UTC) Received: (qmail 4968 invoked by uid 500); 11 Dec 2015 06:07:48 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 4930 invoked by uid 500); 11 Dec 2015 06:07:48 -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 4921 invoked by uid 99); 11 Dec 2015 06:07:48 -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; Fri, 11 Dec 2015 06:07:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5F79DE01C1; Fri, 11 Dec 2015 06:07:48 +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: <9fdadc52afc2440bb7c74ddb379ba321@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-2030 Additional fix for issue with JAVA_HOME containing parenthesis. Date: Fri, 11 Dec 2015 06:07:48 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-1.5 541b2a4ed -> 2089b7890 ignite-2030 Additional fix for 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/2089b789 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2089b789 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2089b789 Branch: refs/heads/ignite-1.5 Commit: 2089b7890dd15eaf5dc1bbf0b8dc03ca1ad18690 Parents: 541b2a4 Author: sboikov Authored: Fri Dec 11 09:07:34 2015 +0300 Committer: sboikov Committed: Fri Dec 11 09:07:34 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 4 ++-- bin/include/parseargs.bat | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2089b789/bin/ignite.bat ---------------------------------------------------------------------- diff --git a/bin/ignite.bat b/bin/ignite.bat index 97c2e45..788a85f 100644 --- a/bin/ignite.bat +++ b/bin/ignite.bat @@ -119,8 +119,8 @@ 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 +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 set RESTART_SUCCESS_FILE="%IGNITE_HOME%\work\ignite_success_%RANDOM_NUMBER%" set RESTART_SUCCESS_OPT=-DIGNITE_SUCCESS_FILE=%RESTART_SUCCESS_FILE% http://git-wip-us.apache.org/repos/asf/ignite/blob/2089b789/bin/include/parseargs.bat ---------------------------------------------------------------------- diff --git a/bin/include/parseargs.bat b/bin/include/parseargs.bat index 86e5766..f2151a7 100644 --- a/bin/include/parseargs.bat +++ b/bin/include/parseargs.bat @@ -39,8 +39,8 @@ :: ) :: 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 +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 %%i in (%reformattedArgs%) do ( if "%%i" == "CommandLineTransformerError" exit /b 1