You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/09 13:13:18 UTC
[12/20] ignite git commit: ignite-2030 Fixed issue with JAVA_HOME
containing parenthesis
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-1537
Commit: 69047243bb1de980647711a59573bf44e69761eb
Parents: bdbe406
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 9 09:27:23 2015 +0300
Committer: sboikov <sb...@gridgain.com>
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