You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2017/12/12 18:39:52 UTC
zookeeper git commit: ZOOKEEPER-2951: remove trailing \ from JAVA_HOME
Repository: zookeeper
Updated Branches:
refs/heads/master 665038e06 -> dcfbe4524
ZOOKEEPER-2951: remove trailing \ from JAVA_HOME
fixes ZOOKEEPER-2951
Author: Jorg Heymans <jo...@gmail.com>
Reviewers: phunt@apache.org
Closes #431 from jorgheymans/master
Change-Id: Id47651ebdbb29574b47863640e928b6a99af6920
Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/dcfbe452
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/dcfbe452
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/dcfbe452
Branch: refs/heads/master
Commit: dcfbe45241855f2caccf3848be2e66e7aa23aa96
Parents: 665038e
Author: Jorg Heymans <jo...@gmail.com>
Authored: Tue Dec 12 10:39:45 2017 -0800
Committer: Patrick Hunt <ph...@apache.org>
Committed: Tue Dec 12 10:39:45 2017 -0800
----------------------------------------------------------------------
bin/zkEnv.cmd | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zookeeper/blob/dcfbe452/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