[geode] branch develop updated: GEODE-4924: Fixes JAVA_ARGS environemnt parameter. (#1673)

[jb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6367925  GEODE-4924: Fixes JAVA_ARGS environemnt parameter. (#1673)
6367925 is described below

commit 636792506ae6bcf869ebfee9f43ec048f426baad
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Fri Mar 23 10:29:36 2018 -0700

    GEODE-4924: Fixes JAVA_ARGS environemnt parameter. (#1673)
    
    - Fixes formatting
    - Removes extra @ (echo suppression)
---
 geode-assembly/src/main/dist/bin/gfsh.bat | 51 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat
index b55ffd7..6708524 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -25,54 +25,51 @@ REM GEODE_HOME - Geode product Directory
 REM
 REM
 
-@setlocal enableextensions
-@set scriptdir=%~dp0
-@set gf=%scriptdir:\bin\=%
+setlocal enableextensions
+set scriptdir=%~dp0
+set gf=%scriptdir:\bin\=%
 REM echo %gf%
 REM echo %scriptdir%
-@if exist "%gf%\lib\geode-dependencies.jar" @goto gfok
-@echo Could not determine GEODE_HOME location
-@verify other 2>nul
-@goto done
+if exist "%gf%\lib\geode-dependencies.jar" goto gfok
+echo Could not determine GEODE_HOME location
+verify other 2>nul
+goto done
 :gfok
-@set GEODE_HOME=%gf%
+set GEODE_HOME=%gf%
 
-@set GFSH_JARS=%GEODE_HOME%\lib\gfsh-dependencies.jar
+set GFSH_JARS=%GEODE_HOME%\lib\gfsh-dependencies.jar
 REM if a system level classpath is set, append it to the classes gfsh will need
-@if defined CLASSPATH (
-    @set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH%
+if defined CLASSPATH (
+    set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH%
 ) else (
-    @set DEPENDENCIES=%GFSH_JARS%
+    set DEPENDENCIES=%GFSH_JARS%
 )
 
-@if not defined GF_JAVA (
+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
-) else (
-    @set GF_JAVA=java
-  )
+    if defined JAVA_HOME (
+        set GF_JAVA=%JAVA_HOME%\bin\java.exe
+    ) else (
+        set GF_JAVA=java
+    )
 )
 
 REM
 REM Copy default .gfshrc to the home directory. Uncomment if needed.
 REM
-REM @if not exist "%USERPROFILE%\.gemfire\.gfsh2rc" (
-REM @xcopy /q "%GEODE_HOME%\defaultConfigs\.gfsh2rc" "%USERPROFILE%\.gemfire"
+REM if not exist "%USERPROFILE%\.gemfire\.gfsh2rc" (
+REM     xcopy /q "%GEODE_HOME%\defaultConfigs\.gfsh2rc" "%USERPROFILE%\.gemfire"
 REM )
 
 REM
 REM Make dir if .gemfire does not exist. Uncomment if needed.
 REM
-REM @if not exist "%USERPROFILE%\.gemfire" (
-REM @mkdir "%USERPROFILE%\.gemfire"
+REM if not exist "%USERPROFILE%\.gemfire" (
+REM     mkdir "%USERPROFILE%\.gemfire"
 REM )
 
-@set LAUNCHER=org.apache.geode.management.internal.cli.Launcher
-@if defined JAVA_ARGS (
-    @set JAVA_ARGS="%JAVA_ARGS%"
-)
+set LAUNCHER=org.apache.geode.management.internal.cli.Launcher
 
 REM Call java with our classpath
-@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %*
+"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %*
 :done

-- 
To stop receiving notification emails like this one, please contact
jbarrett@apache.org.