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-1537 Commit: 2089b7890dd15eaf5dc1bbf0b8dc03ca1ad18690 Parents: 541b2a4 Author: sboikov <[email protected]> Authored: Fri Dec 11 09:07:34 2015 +0300 Committer: sboikov <[email protected]> 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
