This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.10
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.10 by this push:
new 1a801bd Update regex expression in tool.sh (#1729)
1a801bd is described below
commit 1a801bdf9d6d76e121b64721cdfd1daa01ae01ea
Author: Mark Owens <jmar...@apache.org>
AuthorDate: Fri Oct 9 16:36:48 2020 -0400
Update regex expression in tool.sh (#1729)
* Update tool.sh for 1.x to modify the regex to successfully determine the
zookeeper version
---
assemble/bin/tool.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/assemble/bin/tool.sh b/assemble/bin/tool.sh
index c3ed6ee..b7a0b10 100755
--- a/assemble/bin/tool.sh
+++ b/assemble/bin/tool.sh
@@ -38,7 +38,7 @@ fi
ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/lib/zookeeper-[0-9]*[^csn].jar '
ZOOKEEPER_VERSION=$(find -L "$ZOOKEEPER_HOME" -maxdepth 2 -name
"zookeeper-[0-9]*.jar" | head -1)
-if [[ $ZOOKEEPER_VERSION =~ ^3[.][01234].*$ ]]; then
+if [[ $ZOOKEEPER_VERSION =~ ^.*zookeeper-3[.][01234].*$ ]]; then
ZOOKEEPER_CMD='ls -1 $ZOOKEEPER_HOME/zookeeper-[0-9]*[^csn].jar '
fi
if [[ $(eval $ZOOKEEPER_CMD | wc -l) -ne 1 ]] ; then
