From 247a9283f5589430ba466b8cf5b5f805b06ead1c Mon Sep 17 00:00:00 2001 From: "Kevin J. Duling" Date: Tue, 24 May 2016 15:43:28 -0700 Subject: [PATCH 1/2] GEODE-748: Unexpected version string returned from gfsh --- .../gemstone/gemfire/management/internal/cli/shell/Gfsh.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java index 96884417a659..68c3eeb5ee62 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/Gfsh.java @@ -499,7 +499,7 @@ public String getVersion(boolean full) { if (full) { return GemFireVersion.asString(); } else { - return "v" + GemFireVersion.getGemFireVersion(); + return GemFireVersion.getGemFireVersion(); } } From 5243f3cc4a69121af6b16930df7aa3ae037fcd74 Mon Sep 17 00:00:00 2001 From: "Kevin J. Duling" Date: Wed, 25 May 2016 14:37:08 -0700 Subject: [PATCH 2/2] GEODE-1331: gfsh.bat on Windows is incorrect --- geode-assembly/src/main/dist/bin/gfsh.bat | 26 ++++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat index 68132439c676..1a669ebfd06b 100755 --- a/geode-assembly/src/main/dist/bin/gfsh.bat +++ b/geode-assembly/src/main/dist/bin/gfsh.bat @@ -37,25 +37,21 @@ REM echo %scriptdir% :gfok @set GEMFIRE=%gf% -@set GEMFIRE_JARS=%GEMFIRE%\lib\gfsh-dependencies.jar +@set GFSH_JARS=%GEMFIRE%\lib\gfsh-dependencies.jar @if defined CLASSPATH ( -@set GEMFIRE_JARS=%GEMFIRE_JARS%;%CLASSPATH% + @set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH% +) else ( + @set DEPENDENCIES=%GFSH_JARS% ) @if not defined GF_JAVA ( @REM %GF_JAVA% is not defined, assume it is on the PATH -@if defined JAVA_HOME ( -@set GF_JAVA=%JAVA_HOME%\bin\java.exe + @if defined JAVA_HOME ( + @set GF_JAVA=%JAVA_HOME%\bin\java.exe ) else ( -@set GF_JAVA=java + @set GF_JAVA=java + ) ) -) - -REM -REM GFSH_JARS -REM -@set GFSH_JARS=;%GEMFIRE%\lib\gfsh-dependencies.jar -@set CLASSPATH=%GFSH_JARS%;%GEMFIRE_JARS% REM REM Copy default .gfshrc to the home directory. Uncomment if needed. @@ -74,14 +70,14 @@ REM ) REM Consider java is from JDK @set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar @IF EXIST "%TOOLS_JAR%" ( - @set CLASSPATH=%CLASSPATH%;%TOOLS_JAR% + @set DEPENDENCIES=%DEPENDENCIES%;%TOOLS_JAR% ) ELSE ( set TOOLS_JAR= ) @set LAUNCHER=com.gemstone.gemfire.management.internal.cli.Launcher @if defined JAVA_ARGS ( -@set JAVA_ARGS="%JAVA_ARGS%" + @set JAVA_ARGS="%JAVA_ARGS%" ) -@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml %JAVA_ARGS% %LAUNCHER% %* +@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath %DEPENDENCIES% %JAVA_ARGS% %LAUNCHER% %* :done