This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new a2a8c35b9 BIGTOP-3913:The path information is incorrect in the
zookeeper-client script file by building with -PparentDir (#1090)
a2a8c35b9 is described below
commit a2a8c35b9189af4c0b10abc99043668e0e75ff04
Author: guluo <[email protected]>
AuthorDate: Tue Mar 14 22:01:25 2023 +0800
BIGTOP-3913:The path information is incorrect in the zookeeper-client
script file by building with -PparentDir (#1090)
---
bigtop-packages/src/common/zookeeper/install_zookeeper.sh | 8 ++++----
bigtop.bom | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
index fc4f5806f..18f2a1d6b 100755
--- a/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
+++ b/bigtop-packages/src/common/zookeeper/install_zookeeper.sh
@@ -170,11 +170,11 @@ cat > $wrapper <<EOF
# Autodetect JAVA_HOME if not defined
. /usr/lib/bigtop-utils/bigtop-detect-javahome
-export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:-/usr/lib/zookeeper}
+export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:-${LIB_DIR}}
export ZOOKEEPER_CONF=\${ZOOKEEPER_CONF:-/etc/zookeeper/conf}
export
CLASSPATH=\$CLASSPATH:\$ZOOKEEPER_CONF:\$ZOOKEEPER_HOME/*:\$ZOOKEEPER_HOME/lib/*
export ZOOCFGDIR=\${ZOOCFGDIR:-\$ZOOKEEPER_CONF}
-env CLASSPATH=\$CLASSPATH /usr/lib/zookeeper/bin/zkCli.sh "\$@"
+env CLASSPATH=\$CLASSPATH \${ZOOKEEPER_HOME}/bin/zkCli.sh "\$@"
EOF
chmod 755 $wrapper
@@ -188,7 +188,7 @@ for pairs in zkServer.sh/zookeeper-server
zkServer-initialize.sh/zookeeper-serve
. /usr/lib/bigtop-utils/bigtop-detect-javahome
export ZOOPIDFILE=\${ZOOPIDFILE:-/var/run/zookeeper/zookeeper_server.pid}
-export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:-/usr/lib/zookeeper}
+export ZOOKEEPER_HOME=\${ZOOKEEPER_CONF:-${LIB_DIR}}
export ZOOKEEPER_CONF=\${ZOOKEEPER_CONF:-/etc/zookeeper/conf}
export ZOOCFGDIR=\${ZOOCFGDIR:-\$ZOOKEEPER_CONF}
export
CLASSPATH=\$CLASSPATH:\$ZOOKEEPER_CONF:\$ZOOKEEPER_HOME/*:\$ZOOKEEPER_HOME/lib/*
@@ -196,7 +196,7 @@ export ZOO_LOG_DIR=\${ZOO_LOG_DIR:-/var/log/zookeeper}
export ZOO_LOG4J_PROP=\${ZOO_LOG4J_PROP:-INFO,ROLLINGFILE}
export JVMFLAGS=\${JVMFLAGS:--Dzookeeper.log.threshold=INFO}
export ZOO_DATADIR_AUTOCREATE_DISABLE=\${ZOO_DATADIR_AUTOCREATE_DISABLE:-true}
-env CLASSPATH=\$CLASSPATH /usr/lib/zookeeper/bin/${upstream_script} "\$@"
+env CLASSPATH=\$CLASSPATH \${ZOOKEEPER_HOME}/bin/${upstream_script} "\$@"
EOF
chmod 755 $wrapper
done
diff --git a/bigtop.bom b/bigtop.bom
index b8718480d..2a82135fe 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -135,7 +135,7 @@ bigtop {
version {
base = '3.5.9'
pkg = base
- release = 2
+ release = 3
}
tarball {
source = "apache-zookeeper-${version.base}.tar.gz"
