zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ph...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2951: remove trailing \ from JAVA_HOME
Date Tue, 12 Dec 2017 18:40:03 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 508293d6a -> 333dc47b3


ZOOKEEPER-2951: remove trailing \ from JAVA_HOME

 fixes ZOOKEEPER-2951

Author: Jorg Heymans <jorg.heymans@gmail.com>

Reviewers: phunt@apache.org

Closes #431 from jorgheymans/master

Change-Id: Id47651ebdbb29574b47863640e928b6a99af6920
(cherry picked from commit dcfbe45241855f2caccf3848be2e66e7aa23aa96)
Signed-off-by: Patrick Hunt <phunt@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/333dc47b
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/333dc47b
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/333dc47b

Branch: refs/heads/branch-3.5
Commit: 333dc47b32da7dc9af5ac7bb1fcf8a7d2ff3c236
Parents: 508293d
Author: Jorg Heymans <jorg.heymans@gmail.com>
Authored: Tue Dec 12 10:39:45 2017 -0800
Committer: Patrick Hunt <phunt@apache.org>
Committed: Tue Dec 12 10:39:57 2017 -0800

----------------------------------------------------------------------
 bin/zkEnv.cmd | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/333dc47b/bin/zkEnv.cmd
----------------------------------------------------------------------
diff --git a/bin/zkEnv.cmd b/bin/zkEnv.cmd
index 786c90e..9497582 100644
--- a/bin/zkEnv.cmd
+++ b/bin/zkEnv.cmd
@@ -46,5 +46,8 @@ if not exist "%JAVA_HOME%"\bin\java.exe (
   goto :eof
 )
 
+REM strip off trailing \ from JAVA_HOME or java does not start
+if "%JAVA_HOME:~-1%" EQU "\" set "JAVA_HOME=%JAVA_HOME:~0,-1%"
+ 
 set JAVA="%JAVA_HOME%"\bin\java
 


Mime
View raw message